From: Greg Kroah-Hartman Date: Wed, 26 Mar 2014 03:35:59 +0000 (-0700) Subject: remove hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch X-Git-Tag: v3.4.85~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0377a7b1fc955dcc11260934bcd3bde10798148f;p=thirdparty%2Fkernel%2Fstable-queue.git remove hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch --- diff --git a/queue-3.10/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch b/queue-3.10/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch deleted file mode 100644 index 1695f1fea17..00000000000 --- a/queue-3.10/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 117309c51dca42121f70cacec801511b76acf75c Mon Sep 17 00:00:00 2001 -From: Reyad Attiyat -Date: Tue, 28 Jan 2014 16:17:57 +0100 -Subject: HID: microsoft: Add ID's for Surface Type/Touch Cover 2 - -From: Reyad Attiyat - -commit 117309c51dca42121f70cacec801511b76acf75c upstream. - -The Microsoft Surface Type/Touch cover 2 devices have the flag HID_DG_CONTACTID -in their reports.This causes the device to bind to the hid-multitouch driver, -which doesn't handle generic keyboard/mouse input events. The patch adds -the hardware id's of the device to hid-microsoft and to the HID special -driver array, which makes the device get handled by hid-generic/hid-input -properly. - -Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=64811 - -Singed-off-by: Reyad Attiyat -Reviewed-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hid/hid-core.c | 2 ++ - drivers/hid/hid-ids.h | 2 ++ - drivers/hid/hid-microsoft.c | 4 ++++ - 3 files changed, 8 insertions(+) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -1727,6 +1727,8 @@ static const struct hid_device_id hid_ha - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -595,6 +595,8 @@ - #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 - #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730 - #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c -+#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 -+#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 - - #define USB_VENDOR_ID_MOJO 0x8282 - #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -207,6 +207,10 @@ static const struct hid_device_id ms_dev - .driver_data = MS_NOGET }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), - .driver_data = MS_DUPLICATE_USAGES }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), -+ .driver_data = 0 }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), -+ .driver_data = 0 }, - - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), - .driver_data = MS_PRESENTER }, diff --git a/queue-3.10/series b/queue-3.10/series index 00c21af1511..745365ef6f9 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,6 +1,5 @@ alsa-compress-pass-through-return-value-of-open-ops-callback.patch tracing-fix-array-size-mismatch-in-format-string.patch -hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch media-cxusb-unlock-on-error-in-cxusb_i2c_xfer.patch media-dw2102-some-missing-unlocks-on-error.patch media-cx18-check-for-allocation-failure-in-cx18_read_eeprom.patch diff --git a/queue-3.13/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch b/queue-3.13/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch deleted file mode 100644 index 214274df6f4..00000000000 --- a/queue-3.13/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 117309c51dca42121f70cacec801511b76acf75c Mon Sep 17 00:00:00 2001 -From: Reyad Attiyat -Date: Tue, 28 Jan 2014 16:17:57 +0100 -Subject: HID: microsoft: Add ID's for Surface Type/Touch Cover 2 - -From: Reyad Attiyat - -commit 117309c51dca42121f70cacec801511b76acf75c upstream. - -The Microsoft Surface Type/Touch cover 2 devices have the flag HID_DG_CONTACTID -in their reports.This causes the device to bind to the hid-multitouch driver, -which doesn't handle generic keyboard/mouse input events. The patch adds -the hardware id's of the device to hid-microsoft and to the HID special -driver array, which makes the device get handled by hid-generic/hid-input -properly. - -Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=64811 - -Singed-off-by: Reyad Attiyat -Reviewed-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hid/hid-core.c | 2 ++ - drivers/hid/hid-ids.h | 2 ++ - drivers/hid/hid-microsoft.c | 4 ++++ - 3 files changed, 8 insertions(+) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -1778,6 +1778,8 @@ static const struct hid_device_id hid_ha - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -611,6 +611,8 @@ - #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 - #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730 - #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c -+#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 -+#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 - - #define USB_VENDOR_ID_MOJO 0x8282 - #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -207,6 +207,10 @@ static const struct hid_device_id ms_dev - .driver_data = MS_NOGET }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), - .driver_data = MS_DUPLICATE_USAGES }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), -+ .driver_data = 0 }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), -+ .driver_data = 0 }, - - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), - .driver_data = MS_PRESENTER }, diff --git a/queue-3.13/series b/queue-3.13/series index e3a2a0cf306..02bfedcde5a 100644 --- a/queue-3.13/series +++ b/queue-3.13/series @@ -8,7 +8,6 @@ tracing-fix-array-size-mismatch-in-format-string.patch partly-revert-commit-8a10bc9-parisc-sti_console-prefer-linux-fonts-over-built-in-rom-fonts.patch net-davinci_emac-replace-devm_request_irq-with-request_irq.patch nfsv4-use-the-correct-net-namespace-in-nfs4_update_server.patch -hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch media-cxusb-unlock-on-error-in-cxusb_i2c_xfer.patch media-dw2102-some-missing-unlocks-on-error.patch media-cx18-check-for-allocation-failure-in-cx18_read_eeprom.patch diff --git a/queue-3.4/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch b/queue-3.4/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch deleted file mode 100644 index 30cee924368..00000000000 --- a/queue-3.4/hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 117309c51dca42121f70cacec801511b76acf75c Mon Sep 17 00:00:00 2001 -From: Reyad Attiyat -Date: Tue, 28 Jan 2014 16:17:57 +0100 -Subject: HID: microsoft: Add ID's for Surface Type/Touch Cover 2 - -From: Reyad Attiyat - -commit 117309c51dca42121f70cacec801511b76acf75c upstream. - -The Microsoft Surface Type/Touch cover 2 devices have the flag HID_DG_CONTACTID -in their reports.This causes the device to bind to the hid-multitouch driver, -which doesn't handle generic keyboard/mouse input events. The patch adds -the hardware id's of the device to hid-microsoft and to the HID special -driver array, which makes the device get handled by hid-generic/hid-input -properly. - -Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=64811 - -Singed-off-by: Reyad Attiyat -Reviewed-by: Benjamin Tissoires -Signed-off-by: Jiri Kosina -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/hid/hid-core.c | 2 ++ - drivers/hid/hid-ids.h | 2 ++ - drivers/hid/hid-microsoft.c | 4 ++++ - 3 files changed, 8 insertions(+) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -1565,6 +1565,8 @@ static const struct hid_device_id hid_ha - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) }, ---- a/drivers/hid/hid-ids.h -+++ b/drivers/hid/hid-ids.h -@@ -546,6 +546,8 @@ - #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 - #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730 - #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c -+#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 -+#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 - - #define USB_VENDOR_ID_MOJO 0x8282 - #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -206,6 +206,10 @@ static const struct hid_device_id ms_dev - .driver_data = MS_NOGET }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), - .driver_data = MS_DUPLICATE_USAGES }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), -+ .driver_data = 0 }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), -+ .driver_data = 0 }, - - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), - .driver_data = MS_PRESENTER }, diff --git a/queue-3.4/series b/queue-3.4/series index 9d4ca175783..68f3c9cc266 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -1,5 +1,4 @@ alsa-compress-pass-through-return-value-of-open-ops-callback.patch -hid-microsoft-add-id-s-for-surface-type-touch-cover-2.patch libceph-resend-all-writes-after-the-osdmap-loses-the-full-flag.patch iwlwifi-complete-backport-of-iwlwifi-always-copy-first-16-bytes-of-commands.patch x86-bpf_jit-support-negative-offsets.patch