| From 81099f97bd31e25ff2719a435b1860fc3876122f Mon Sep 17 00:00:00 2001 |
| From: Hans de Goede <hdegoede@redhat.com> |
| Date: Thu, 19 May 2016 17:12:19 +0200 |
| Subject: usb: quirks: Fix sorting |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| commit 81099f97bd31e25ff2719a435b1860fc3876122f upstream. |
| |
| Properly sort all the entries by vendor id. |
| |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/core/quirks.c | 20 ++++++++++---------- |
| 1 file changed, 10 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/usb/core/quirks.c |
| +++ b/drivers/usb/core/quirks.c |
| @@ -44,6 +44,9 @@ static const struct usb_device_id usb_qu |
| /* Creative SB Audigy 2 NX */ |
| { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, |
| |
| + /* USB3503 */ |
| + { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME }, |
| + |
| /* Microsoft Wireless Laser Mouse 6000 Receiver */ |
| { USB_DEVICE(0x045e, 0x00e1), .driver_info = USB_QUIRK_RESET_RESUME }, |
| |
| @@ -173,6 +176,10 @@ static const struct usb_device_id usb_qu |
| /* MAYA44USB sound device */ |
| { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME }, |
| |
| + /* ASUS Base Station(T100) */ |
| + { USB_DEVICE(0x0b05, 0x17e0), .driver_info = |
| + USB_QUIRK_IGNORE_REMOTE_WAKEUP }, |
| + |
| /* Action Semiconductor flash disk */ |
| { USB_DEVICE(0x10d6, 0x2200), .driver_info = |
| USB_QUIRK_STRING_FETCH_255 }, |
| @@ -188,16 +195,6 @@ static const struct usb_device_id usb_qu |
| { USB_DEVICE(0x1908, 0x1315), .driver_info = |
| USB_QUIRK_HONOR_BNUMINTERFACES }, |
| |
| - /* INTEL VALUE SSD */ |
| - { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, |
| - |
| - /* 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 }, |
| @@ -208,6 +205,9 @@ static const struct usb_device_id usb_qu |
| /* Blackmagic Design UltraStudio SDI */ |
| { USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM }, |
| |
| + /* INTEL VALUE SSD */ |
| + { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, |
| + |
| { } /* terminating entry must be last */ |
| }; |
| |