From: Greg Kroah-Hartman Date: Mon, 3 Dec 2018 17:44:15 +0000 (+0100) Subject: 3.18-stable patches X-Git-Tag: v4.19.7~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bd08540e6f6251a3cd0236eee175441c531a57b;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch usb-usb-storage-add-new-ids-to-ums-realtek.patch --- diff --git a/queue-3.18/series b/queue-3.18/series index 0e6c843198e..6927630b35b 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -8,3 +8,5 @@ alsa-sparc-fix-invalid-snd_free_pages-at-error-path.patch ext2-fix-potential-use-after-free.patch dmaengine-at_hdmac-fix-memory-leak-in-at_dma_xlate.patch dmaengine-at_hdmac-fix-module-unloading.patch +usb-usb-storage-add-new-ids-to-ums-realtek.patch +usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch diff --git a/queue-3.18/usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch b/queue-3.18/usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch new file mode 100644 index 00000000000..5f2cb1105cd --- /dev/null +++ b/queue-3.18/usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch @@ -0,0 +1,37 @@ +From effd14f66cc1ef6701a19c5a56e39c35f4d395a5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= +Date: Sun, 25 Nov 2018 17:57:33 +0100 +Subject: usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream series +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michael Niewöhner + +commit effd14f66cc1ef6701a19c5a56e39c35f4d395a5 upstream. + +Cherry G230 Stream 2.0 (G85-231) and 3.0 (G85-232) need this quirk to +function correctly. This fixes a but where double pressing numlock locks +up the device completely with need to replug the keyboard. + +Signed-off-by: Michael Niewöhner +Tested-by: Michael Niewöhner +Cc: stable +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/core/quirks.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -56,6 +56,9 @@ static const struct usb_device_id usb_qu + /* Microsoft LifeCam-VX700 v2.0 */ + { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */ ++ { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Logitech HD Pro Webcams C920, C920-C, C925e and C930e */ + { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, + { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, diff --git a/queue-3.18/usb-usb-storage-add-new-ids-to-ums-realtek.patch b/queue-3.18/usb-usb-storage-add-new-ids-to-ums-realtek.patch new file mode 100644 index 00000000000..f2de74d8c79 --- /dev/null +++ b/queue-3.18/usb-usb-storage-add-new-ids-to-ums-realtek.patch @@ -0,0 +1,40 @@ +From a84a1bcc992f0545a51d2e120b8ca2ef20e2ea97 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Fri, 23 Nov 2018 08:42:19 +0000 +Subject: USB: usb-storage: Add new IDs to ums-realtek + +From: Kai-Heng Feng + +commit a84a1bcc992f0545a51d2e120b8ca2ef20e2ea97 upstream. + +There are two new Realtek card readers require ums-realtek to work +correctly. + +Add the new IDs to support them. + +Signed-off-by: Kai-Heng Feng +Acked-by: Alan Stern +Cc: stable +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/unusual_realtek.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/usb/storage/unusual_realtek.h ++++ b/drivers/usb/storage/unusual_realtek.h +@@ -38,4 +38,14 @@ UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x99 + "USB Card Reader", + USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), + ++UNUSUAL_DEV(0x0bda, 0x0177, 0x0000, 0x9999, ++ "Realtek", ++ "USB Card Reader", ++ USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), ++ ++UNUSUAL_DEV(0x0bda, 0x0184, 0x0000, 0x9999, ++ "Realtek", ++ "USB Card Reader", ++ USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), ++ + #endif /* defined(CONFIG_USB_STORAGE_REALTEK) || ... */