[kernel] r16956 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Mon Feb 28 19:50:26 2011
New Revision: 16956

Log:
add usb hid quirk for Cypress barcode scanner

already fwd to stable too.

Reported-by: Julien BLACHE <jblache at debian.org>
Signed-off-by: maximilian attems <max at stro.at>

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/HID-add-support-for-Acan-FG-8100-barcode-reader.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/31

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Feb 28 14:53:31 2011	(r16955)
+++ dists/squeeze/linux-2.6/debian/changelog	Mon Feb 28 19:50:26 2011	(r16956)
@@ -47,6 +47,7 @@
   * Update openvz patch to 07aaa2e9fb25 (ipv6, checkpointing, stability,
     ipsec, ppp, tc). (closes: #607041, #613501)
   * Add openvz nfs fixes. (closes: #613170)
+  * HID: add support for Acan FG-8100 barcode reader. (closes: #615888)
 
   [ Aurelien Jarno ]
   * init: fix race between init and kthreadd, fixes a kernel panic on 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/HID-add-support-for-Acan-FG-8100-barcode-reader.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/HID-add-support-for-Acan-FG-8100-barcode-reader.patch	Mon Feb 28 19:50:26 2011	(r16956)
@@ -0,0 +1,58 @@
+From: Jiri Kosina <jkosina at suse.cz>
+Date: Wed, 2 Dec 2009 22:54:11 +0100
+Subject: [PATCH] HID: add support for Acan FG-8100 barcode reader
+
+commit e8d0eab4d9eda9f5e97852f780f020bfb134f9f0 upstream.
+
+Acan FG-8100 barcode reader (0x04b4/0xbca1) has vendor ID of
+cypress and requires the same MIN/MAX swap descriptor quirk
+as other barcode readers from cypress.
+
+Reported-by: Stijn Ghesquiere <stijn at applesnail.net>
+Signed-off-by: Jiri Kosina <jkosina at suse.cz>
+---
+ drivers/hid/hid-core.c    |    1 +
+ drivers/hid/hid-cypress.c |    2 ++
+ drivers/hid/hid-ids.h     |    1 +
+ 3 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 7d05c4b..e2e8741 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1294,6 +1294,7 @@ static const struct hid_device_id hid_blacklist[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c
+index 62e9cb1..998b6f4 100644
+--- a/drivers/hid/hid-cypress.c
++++ b/drivers/hid/hid-cypress.c
+@@ -126,6 +126,8 @@ static const struct hid_device_id cp_devices[] = {
+ 		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2),
+ 		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3),
++		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),
+ 		.driver_data = CP_2WHEEL_MOUSE_HACK },
+ 	{ }
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index adbef5d..656c015 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -145,6 +145,7 @@
+ #define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE	0x7417
+ #define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61
+ #define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64
++#define USB_DEVICE_ID_CYPRESS_BARCODE_3	0xbca1
+ 
+ #define USB_VENDOR_ID_DEALEXTREAME	0x10c5
+ #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a
+-- 
+1.7.4.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31	Mon Feb 28 14:53:31 2011	(r16955)
+++ dists/squeeze/linux-2.6/debian/patches/series/31	Mon Feb 28 19:50:26 2011	(r16956)
@@ -42,3 +42,4 @@
 + bugfix/all/ALSA-caiaq-Fix-possible-string-buffer-overflow.patch
 + bugfix/all/fs-partitions-Validate-map_count-in-Mac-partition-ta.patch
 + features/all/hwmon-k10temp.patch
++ bugfix/all/HID-add-support-for-Acan-FG-8100-barcode-reader.patch