diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-18 14:09:42 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-18 14:09:42 +0200 |
commit | 0982af0e4b5622aaae02f43925fe1152006f878e (patch) | |
tree | 38f7971d08e822fa0a4ffcb5e432b7da993da497 /libre/lirc-libre/lirc_atiusb-kfifo.patch | |
parent | 38389505b5f8809743855ead04f7feb9a37a9cc8 (diff) | |
parent | 014b5d0a1ee98ba0466f067f605b9637f2a14b2f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nautilus-actions/PKGBUILD
extra/libdrm/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-dbd-mysql/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-libpng/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/bind/PKGBUILD
testing/dmraid/PKGBUILD
testing/glibc/PKGBUILD
Diffstat (limited to 'libre/lirc-libre/lirc_atiusb-kfifo.patch')
-rw-r--r-- | libre/lirc-libre/lirc_atiusb-kfifo.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch new file mode 100644 index 000000000..a64984dce --- /dev/null +++ b/libre/lirc-libre/lirc_atiusb-kfifo.patch @@ -0,0 +1,31 @@ +From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 +From: Jason Martin <publicmsu@gmail.com> +Date: Fri, 3 Jun 2011 00:12:51 -0400 +Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo + +I came across posts with regards to lirc_atiusb and its compatibility +with newer kernels, and their use of kfifo.I spent a little bit of time +this evening, and was able to correct the issues with the driver, and +now have a functioning lirc_atiusb device under the 2.6.38 kernel. + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + drivers/lirc_atiusb/lirc_atiusb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +index 52080de..bf2b631 100644 +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) + goto new_irctl_failure_check; + } + +- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { + mem_failure = 4; + goto new_irctl_failure_check; + } +-- +1.7.0.1 + |