summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-05-13 10:53:25 -0700
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-14 08:12:55 -0400
commit8d884182acb48df17078306d88497878e60a45ce (patch)
treede5235191b2f519dc1de0892ba9f132b18d60557
parent0b98652e261d2a1f8c9a39f1ba5a854f9647e0cb (diff)
downloadkernel-8d884182acb48df17078306d88497878e60a45ce.tar.gz
kernel-8d884182acb48df17078306d88497878e60a45ce.tar.xz
kernel-8d884182acb48df17078306d88497878e60a45ce.zip
Fix spew from KVM switch (rhbz 1219343)
-rw-r--r--0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch52
-rw-r--r--kernel.spec9
2 files changed, 61 insertions, 0 deletions
diff --git a/0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch b/0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
new file mode 100644
index 000000000..d1859af28
--- /dev/null
+++ b/0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
@@ -0,0 +1,52 @@
+From 25c1b8af5b11bd1dbd17d0c1212586bb56ec4efd Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@fedoraproject.org>
+Date: Fri, 8 May 2015 14:13:56 -0700
+Subject: [PATCH] HID: usbhid: Add HID_QUIRK_NOGET for Aten DVI KVM switch
+To: Jiri Kosina <jkosina@suse.cz>
+Cc: linux-input@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Cc: linux-usb@vger.kernel.org
+Cc: stephane.tranchemer@devinci.fr
+
+Like other KVM switches, the Aten DVI KVM switch needs a
+quirk to avoid spewing errors:
+
+[791759.606542] usb 1-5.4: input irq status -75 received
+[791759.614537] usb 1-5.4: input irq status -75 received
+[791759.622542] usb 1-5.4: input irq status -75 received
+
+Add it.
+
+Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
+---
+ drivers/hid/hid-ids.h | 1 +
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 41f167e..7ce93d9 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -164,6 +164,7 @@
+ #define USB_DEVICE_ID_ATEN_2PORTKVM 0x2204
+ #define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205
+ #define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208
++#define USB_DEVICE_ID_ATEN_CS682 0x2213
+
+ #define USB_VENDOR_ID_ATMEL 0x03eb
+ #define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index a775143..4696895e 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -61,6 +61,7 @@ static const struct hid_blacklist {
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
++ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FIGHTERSTICK, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
+--
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 7cfc532f3..7806b696f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -610,6 +610,9 @@ Patch26176: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
#rhbz 1210857
Patch26192: blk-loop-avoid-too-many-pending-per-work-IO.patch
+#rhbz 1219343
+Patch26200: 0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1340,6 +1343,9 @@ ApplyPatch Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
#rhbz 1210857
ApplyPatch blk-loop-avoid-too-many-pending-per-work-IO.patch
+#rhbz 1219343
+ApplyPatch 0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2200,6 +2206,9 @@ fi
#
#
%changelog
+* Wed May 13 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix spew from KVM switch (rhbz 1219343)
+
* Wed May 13 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git2.1
- Linux v4.1-rc3-165-g110bc76729d4