Skip to content

Commit c56eeff

Browse files
jwrdegoedegregkh
authored andcommitted
usb: quirks: Fix sorting
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>
1 parent b66baf4 commit c56eeff

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

drivers/usb/core/quirks.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
4444
/* Creative SB Audigy 2 NX */
4545
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
4646

47+
/* USB3503 */
48+
{ USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },
49+
4750
/* Microsoft Wireless Laser Mouse 6000 Receiver */
4851
{ USB_DEVICE(0x045e, 0x00e1), .driver_info = USB_QUIRK_RESET_RESUME },
4952

@@ -173,6 +176,10 @@ static const struct usb_device_id usb_quirk_list[] = {
173176
/* MAYA44USB sound device */
174177
{ USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },
175178

179+
/* ASUS Base Station(T100) */
180+
{ USB_DEVICE(0x0b05, 0x17e0), .driver_info =
181+
USB_QUIRK_IGNORE_REMOTE_WAKEUP },
182+
176183
/* Action Semiconductor flash disk */
177184
{ USB_DEVICE(0x10d6, 0x2200), .driver_info =
178185
USB_QUIRK_STRING_FETCH_255 },
@@ -188,16 +195,6 @@ static const struct usb_device_id usb_quirk_list[] = {
188195
{ USB_DEVICE(0x1908, 0x1315), .driver_info =
189196
USB_QUIRK_HONOR_BNUMINTERFACES },
190197

191-
/* INTEL VALUE SSD */
192-
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
193-
194-
/* USB3503 */
195-
{ USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },
196-
197-
/* ASUS Base Station(T100) */
198-
{ USB_DEVICE(0x0b05, 0x17e0), .driver_info =
199-
USB_QUIRK_IGNORE_REMOTE_WAKEUP },
200-
201198
/* Protocol and OTG Electrical Test Device */
202199
{ USB_DEVICE(0x1a0a, 0x0200), .driver_info =
203200
USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },
@@ -208,6 +205,9 @@ static const struct usb_device_id usb_quirk_list[] = {
208205
/* Blackmagic Design UltraStudio SDI */
209206
{ USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
210207

208+
/* INTEL VALUE SSD */
209+
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
210+
211211
{ } /* terminating entry must be last */
212212
};
213213

0 commit comments

Comments
 (0)