From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 21:02:13 +0000 (-0800) Subject: remove hid patch from outside of queues X-Git-Tag: v3.4.75~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e9f03f909408a380f17218cadf3eded43c58ccb;p=thirdparty%2Fkernel%2Fstable-queue.git remove hid patch from outside of queues --- diff --git a/hid-kye-add-report-fixup-for-genius-manticore-keyboard.patch b/hid-kye-add-report-fixup-for-genius-manticore-keyboard.patch deleted file mode 100644 index b369dbdddd2..00000000000 --- a/hid-kye-add-report-fixup-for-genius-manticore-keyboard.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4a2c94c9b6c03af61b04993340bd9559e2277de4 Mon Sep 17 00:00:00 2001 -From: Benjamin Tissoires -Date: Wed, 20 Nov 2013 09:49:41 -0500 -Subject: HID: kye: Add report fixup for Genius Manticore Keyboard - -From: Benjamin Tissoires - -commit 4a2c94c9b6c03af61b04993340bd9559e2277de4 upstream. - -Genius Manticore Keyboard presents the same problem in its report -descriptors than Genius Gila Gaming Mouse and Genius Imperator Keyboard. -Use the same fixup. - -Reported-and-tested-by: Adam Kulagowski -Signed-off-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hid/hid-core.c | 1 + - drivers/hid/hid-ids.h | 1 + - drivers/hid/hid-kye.c | 5 +++++ - 3 files changed, 7 insertions(+) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -1723,6 +1723,7 @@ static const struct hid_device_id hid_ha - { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -488,6 +488,7 @@ - #define USB_VENDOR_ID_KYE 0x0458 - #define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 - #define USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE 0x0138 -+#define USB_DEVICE_ID_GENIUS_MANTICORE 0x0153 - #define USB_DEVICE_ID_GENIUS_GX_IMPERATOR 0x4018 - #define USB_DEVICE_ID_KYE_GPEN_560 0x5003 - #define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010 ---- a/drivers/hid/hid-kye.c -+++ b/drivers/hid/hid-kye.c -@@ -341,6 +341,9 @@ static __u8 *kye_report_fixup(struct hid - case USB_DEVICE_ID_GENIUS_GX_IMPERATOR: - rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83, - "Genius Gx Imperator Keyboard"); -+ case USB_DEVICE_ID_GENIUS_MANTICORE: -+ rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104, -+ "Genius Manticore Keyboard"); - break; - } - return rdesc; -@@ -439,6 +442,8 @@ static const struct hid_device_id kye_de - USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_KYE, - USB_DEVICE_ID_GENIUS_GX_IMPERATOR) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_KYE, -+ USB_DEVICE_ID_GENIUS_MANTICORE) }, - { } - }; - MODULE_DEVICE_TABLE(hid, kye_devices);