Skip to content

Commit 96ef50e

Browse files
jhovoldgregkh
authored andcommitted
USB: quirks: sort quirk entries
commit 43861d2 upstream. Move the last entry to its proper place to maintain the VID/PID sort order. Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://lore.kernel.org/r/20210210111746.13360-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fce3654 commit 96ef50e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/usb/core/quirks.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,9 @@ static const struct usb_device_id usb_quirk_list[] = {
415415
{ USB_DEVICE(0x10d6, 0x2200), .driver_info =
416416
USB_QUIRK_STRING_FETCH_255 },
417417

418+
/* novation SoundControl XL */
419+
{ USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME },
420+
418421
/* Huawei 4G LTE module */
419422
{ USB_DEVICE(0x12d1, 0x15bb), .driver_info =
420423
USB_QUIRK_DISCONNECT_SUSPEND },
@@ -495,9 +498,6 @@ static const struct usb_device_id usb_quirk_list[] = {
495498
/* INTEL VALUE SSD */
496499
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
497500

498-
/* novation SoundControl XL */
499-
{ USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME },
500-
501501
{ } /* terminating entry must be last */
502502
};
503503

0 commit comments

Comments
 (0)