diff options
author | Josh Boyer <jwboyer@redhat.com> | 2013-03-18 09:47:02 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-18 09:54:40 -0400 |
commit | 620ae90ed8ca8b6e40cb9e10279b4f5ef9f0ab81 (patch) | |
tree | c9185bfa00e25d11d3a475db162d7aea39c177e6 /drivers | |
parent | 3d464d9b71ef2f2b40a4bc9dcf06794fd1be9d12 (diff) |
HID: usbhid: quirk for MSI GX680R led panel
This keyboard backlight device causes a 10 second delay to boot. Add it
to the quirk list with HID_QUIRK_NO_INIT_REPORTS.
This fixes Red Hat bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=907221
Cc: stable@vger.kernel.org
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3fc5c33561d5..49b88a0608fb 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -587,6 +587,9 @@ | |||
587 | #define USB_VENDOR_ID_MONTEREY 0x0566 | 587 | #define USB_VENDOR_ID_MONTEREY 0x0566 |
588 | #define USB_DEVICE_ID_GENIUS_KB29E 0x3004 | 588 | #define USB_DEVICE_ID_GENIUS_KB29E 0x3004 |
589 | 589 | ||
590 | #define USB_VENDOR_ID_MSI 0x1770 | ||
591 | #define USB_DEVICE_ID_MSI_GX680R_LED_PANEL 0xff00 | ||
592 | |||
590 | #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400 | 593 | #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400 |
591 | #define USB_DEVICE_ID_N_S_HARMONY 0xc359 | 594 | #define USB_DEVICE_ID_N_S_HARMONY 0xc359 |
592 | 595 | ||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index e991d81602b6..476c984dbdf3 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -73,6 +73,7 @@ static const struct hid_blacklist { | |||
73 | { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, | 73 | { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, |
74 | { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, | 74 | { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, |
75 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, | 75 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, |
76 | { USB_VENDIR_ID_MSI, USB_DEVICE_ID_MSI_GX680R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, | ||
76 | { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS }, | 77 | { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS }, |
77 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, | 78 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, |
78 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, | 79 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, |