Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:41 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:52 +0200
commit847c10fe2541133bb7a9982cd11365e95494850d (patch)
tree581d1ac38bb7f6c1b2babc977a49459aa0ccfe1b
parenta6ed59f05cdab3bd62f1d17d88e4317d9232b9f2 (diff)
HID: Add another Primax PIXART OEM mouse quirk (bnc#1012628).
-rw-r--r--patches.kernel.org/5.2.1-039-HID-Add-another-Primax-PIXART-OEM-mouse-quirk.patch53
-rw-r--r--series.conf1
2 files changed, 54 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.1-039-HID-Add-another-Primax-PIXART-OEM-mouse-quirk.patch b/patches.kernel.org/5.2.1-039-HID-Add-another-Primax-PIXART-OEM-mouse-quirk.patch
new file mode 100644
index 0000000000..28e9e55a28
--- /dev/null
+++ b/patches.kernel.org/5.2.1-039-HID-Add-another-Primax-PIXART-OEM-mouse-quirk.patch
@@ -0,0 +1,53 @@
+From: Sebastian Parschauer <s.parschauer@gmx.de>
+Date: Mon, 1 Jul 2019 07:48:17 +0200
+Subject: [PATCH] HID: Add another Primax PIXART OEM mouse quirk
+References: bnc#1012628
+Patch-mainline: 5.2.1
+Git-commit: 4c12954965fdf33d8ae3883c1931fc29ca023cfb
+
+commit 4c12954965fdf33d8ae3883c1931fc29ca023cfb upstream.
+
+The PixArt OEM mice are known for disconnecting every minute in
+runlevel 1 or 3 if they are not always polled. So add quirk
+ALWAYS_POLL for this Alienware branded Primax mouse as well.
+
+Daniel Schepler (@dschepler) reported and tested the quirk.
+Reference: https://github.com/sriemer/fix-linux-mouse/issues/15
+
+Signed-off-by: Sebastian Parschauer <s.parschauer@gmx.de>
+CC: stable@vger.kernel.org
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/hid/hid-ids.h | 1 +
+ drivers/hid/hid-quirks.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index b032d3899fa3..bfc584ada4eb 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -1241,6 +1241,7 @@
+ #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
+ #define USB_DEVICE_ID_PRIMAX_REZEL 0x4e72
+ #define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F 0x4d0f
++#define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D65 0x4d65
+ #define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22 0x4e22
+
+
+diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
+index 671a285724f9..1549c7a2f04c 100644
+--- a/drivers/hid/hid-quirks.c
++++ b/drivers/hid/hid-quirks.c
+@@ -130,6 +130,7 @@ static const struct hid_device_id hid_quirks[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4D22), HID_QUIRK_ALWAYS_POLL },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F), HID_QUIRK_ALWAYS_POLL },
++ { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D65), HID_QUIRK_ALWAYS_POLL },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22), HID_QUIRK_ALWAYS_POLL },
+ { HID_USB_DEVICE(USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS), HID_QUIRK_NOGET },
+ { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001), HID_QUIRK_NOGET },
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index 4c4f44712f..02d2dc41a1 100644
--- a/series.conf
+++ b/series.conf
@@ -65,6 +65,7 @@
patches.kernel.org/5.2.1-036-staging-bcm2835-camera-Restore-return-behavior-.patch
patches.kernel.org/5.2.1-037-staging-comedi-amplc_pci230-fix-null-pointer-de.patch
patches.kernel.org/5.2.1-038-staging-mt7621-pci-fix-PCIE_FTS_NUM_LO-macro.patch
+ patches.kernel.org/5.2.1-039-HID-Add-another-Primax-PIXART-OEM-mouse-quirk.patch
########################################################
# Build fixes that apply to the vanilla kernel too.