From 45f8b0825cfa51fde5f20ea5b5802105dcee8511 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 1 Aug 2016 21:12:27 +0100 Subject: [PATCH] USB: quirks: Fix entries on wrong list in 3.16.y Commits ddbe1fca0bcb ("USB: Add device quirk for ASUS T100 Base Station keyboard") and e5dff0e80463 ("USB: Add OTG PET device to TPL") were wrongly backported to 3.16.y. The original commits added to usb_quirk_list but the backported versions added to usb_interface_quirk_list. Signed-off-by: Ben Hutchings --- drivers/usb/core/quirks.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 0e8e656a045f6..6b53fc3ec636a 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -188,6 +188,14 @@ static const struct usb_device_id usb_quirk_list[] = { /* USB3503 */ { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME }, + /* ASUS Base Station(T100) */ + { USB_DEVICE(0x0b05, 0x17e0), .driver_info = + USB_QUIRK_IGNORE_REMOTE_WAKEUP }, + + /* Protocol and OTG Electrical Test Device */ + { USB_DEVICE(0x1a0a, 0x0200), .driver_info = + USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* Blackmagic Design Intensity Shuttle */ { USB_DEVICE(0x1edb, 0xbd3b), .driver_info = USB_QUIRK_NO_LPM }, @@ -202,14 +210,6 @@ static const struct usb_device_id usb_interface_quirk_list[] = { { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), .driver_info = USB_QUIRK_RESET_RESUME }, - /* ASUS Base Station(T100) */ - { USB_DEVICE(0x0b05, 0x17e0), .driver_info = - USB_QUIRK_IGNORE_REMOTE_WAKEUP }, - - /* Protocol and OTG Electrical Test Device */ - { USB_DEVICE(0x1a0a, 0x0200), .driver_info = - USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, - { } /* terminating entry must be last */ }; -- 2.47.3