From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 17 Oct 2011 18:35:25 +0000 (-0700)
Subject: 3.0 patches
X-Git-Tag: v3.0.8~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f458d46f5f125a954dd0e280c7969151b27af2c;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0 patches
---

diff --git a/queue-3.0/hid-usbhid-add-support-for-sigma-micro-chip.patch b/queue-3.0/hid-usbhid-add-support-for-sigma-micro-chip.patch
new file mode 100644
index 00000000000..05e35f921cc
--- /dev/null
+++ b/queue-3.0/hid-usbhid-add-support-for-sigma-micro-chip.patch
@@ -0,0 +1,49 @@
+From f5e4282586dc0c9dab8c7d32e6c43aa07f68586b Mon Sep 17 00:00:00 2001
+From: Jeremiah Matthey <sprg86@gmail.com>
+Date: Tue, 23 Aug 2011 09:44:30 +0200
+Subject: HID: usbhid: Add support for SiGma Micro chip
+
+From: Jeremiah Matthey <sprg86@gmail.com>
+
+commit f5e4282586dc0c9dab8c7d32e6c43aa07f68586b upstream.
+
+Patch to add SiGma Micro-based keyboards (1c4f:0002) to hid-quirks.
+
+These keyboards dont seem to allow the records to be initialized, and hence a
+timeout occurs when the usbhid driver attempts to initialize them. The patch
+just adds the signature for these keyboards to the hid-quirks list with the
+setting HID_QUIRK_NO_INIT_REPORTS. This removes the 5-10 second wait for the
+timeout to occur.
+
+Signed-off-by: Jeremiah Matthey <sprg86@gmail.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hid/hid-ids.h           |    3 +++
+ drivers/hid/usbhid/hid-quirks.c |    1 +
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -568,6 +568,9 @@
+ #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
+ #define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE	0x0600
+ 
++#define USB_VENDOR_ID_SIGMA_MICRO	0x1c4f
++#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD	0x0002
++
+ #define USB_VENDOR_ID_SKYCABLE			0x1223
+ #define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
+ 
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -89,6 +89,7 @@ static const struct hid_blacklist {
+ 
+ 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT },
++	{ USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ 0, 0 }
+ };
+ 
diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644
index 00000000000..450c5faf342
--- /dev/null
+++ b/queue-3.0/series
@@ -0,0 +1 @@
+hid-usbhid-add-support-for-sigma-micro-chip.patch