From: Sasha Levin Date: Tue, 3 Sep 2019 04:56:23 +0000 (-0400) Subject: fixes for 5.2 X-Git-Tag: v4.4.191~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afff6d450d063767e94abff6abaeea1476582467;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 5.2 Signed-off-by: Sasha Levin --- diff --git a/queue-5.2/hid-logitech-hidpp-remove-support-for-the-g700-over-.patch b/queue-5.2/hid-logitech-hidpp-remove-support-for-the-g700-over-.patch new file mode 100644 index 00000000000..5a5779f7342 --- /dev/null +++ b/queue-5.2/hid-logitech-hidpp-remove-support-for-the-g700-over-.patch @@ -0,0 +1,43 @@ +From 62cd3bd1c955fe39db728319e7eb8dfbdbf13fee Mon Sep 17 00:00:00 2001 +From: Benjamin Tissoires +Date: Tue, 13 Aug 2019 15:38:07 +0200 +Subject: HID: logitech-hidpp: remove support for the G700 over USB +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit a3384b8d9f63cc042711293bb97bdc92dca0391d ] + +The G700 suffers from the same issue than the G502: +when plugging it in, the driver tries to contact it but it fails. + +This timeout is problematic as it introduce a delay in the boot, +and having only the mouse event node means that the hardware +macros keys can not be relayed to the userspace. + +Link: https://github.com/libratbag/libratbag/issues/797 +Fixes: 91cf9a98ae41 ("HID: logitech-hidpp: make .probe usbhid capable") +Cc: stable@vger.kernel.org # v5.2 +Reviewed-by: Filipe Laíns +Signed-off-by: Benjamin Tissoires +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-logitech-hidpp.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c +index 34e2b3f9d540d..4effce12607b0 100644 +--- a/drivers/hid/hid-logitech-hidpp.c ++++ b/drivers/hid/hid-logitech-hidpp.c +@@ -3769,8 +3769,6 @@ static const struct hid_device_id hidpp_devices[] = { + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC332) }, + { /* Logitech G502 Hero Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08B) }, +- { /* Logitech G700 Gaming Mouse over USB */ +- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC06B) }, + { /* Logitech G700s Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07C) }, + { /* Logitech G703 Gaming Mouse over USB */ +-- +2.20.1 + diff --git a/queue-5.2/series b/queue-5.2/series index a679a17e9c2..0ce524ee63a 100644 --- a/queue-5.2/series +++ b/queue-5.2/series @@ -71,3 +71,4 @@ uprobes-x86-fix-detection-of-32-bit-user-mode.patch x86-mm-cpa-prevent-large-page-split-when-ftrace-flips-rw-on-kernel-text.patch x86-apic-do-not-initialize-ldr-and-dfr-for-bigsmp.patch x86-apic-include-the-ldr-when-clearing-out-apic-registers.patch +hid-logitech-hidpp-remove-support-for-the-g700-over-.patch