From: Greg Kroah-Hartman Date: Mon, 3 Dec 2018 17:46:46 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.19.7~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=176e2dca3a51e6db5f541406523e92351aaed66e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch 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-4.4/misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch b/queue-4.4/misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch new file mode 100644 index 00000000000..e37be98d2de --- /dev/null +++ b/queue-4.4/misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch @@ -0,0 +1,38 @@ +From 6484a677294aa5d08c0210f2f387ebb9be646115 Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Wed, 14 Nov 2018 01:57:03 +0000 +Subject: misc: mic/scif: fix copy-paste error in scif_create_remote_lookup + +From: YueHaibing + +commit 6484a677294aa5d08c0210f2f387ebb9be646115 upstream. + +gcc '-Wunused-but-set-variable' warning: + +drivers/misc/mic/scif/scif_rma.c: In function 'scif_create_remote_lookup': +drivers/misc/mic/scif/scif_rma.c:373:25: warning: + variable 'vmalloc_num_pages' set but not used [-Wunused-but-set-variable] + +'vmalloc_num_pages' should be used to determine if the address is +within the vmalloc range. + +Fixes: ba612aa8b487 ("misc: mic: SCIF memory registration and unregistration") +Signed-off-by: YueHaibing +Cc: stable +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/mic/scif/scif_rma.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/misc/mic/scif/scif_rma.c ++++ b/drivers/misc/mic/scif/scif_rma.c +@@ -414,7 +414,7 @@ static int scif_create_remote_lookup(str + if (err) + goto error_window; + err = scif_map_page(&window->num_pages_lookup.lookup[j], +- vmalloc_dma_phys ? ++ vmalloc_num_pages ? + vmalloc_to_page(&window->num_pages[i]) : + virt_to_page(&window->num_pages[i]), + remote_dev); diff --git a/queue-4.4/series b/queue-4.4/series index cada4703674..b00dfaf7104 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -15,3 +15,6 @@ 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 btrfs-release-metadata-before-running-delayed-refs.patch +usb-usb-storage-add-new-ids-to-ums-realtek.patch +usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch +misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch diff --git a/queue-4.4/usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch b/queue-4.4/usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch new file mode 100644 index 00000000000..a52f03989bb --- /dev/null +++ b/queue-4.4/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 +@@ -64,6 +64,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-4.4/usb-usb-storage-add-new-ids-to-ums-realtek.patch b/queue-4.4/usb-usb-storage-add-new-ids-to-ums-realtek.patch new file mode 100644 index 00000000000..f2de74d8c79 --- /dev/null +++ b/queue-4.4/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) || ... */