Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b30454e authored by Hans de Goede's avatar Hans de Goede Committed by Sasha Levin
Browse files

usb: quirks: Fix sorting 



[ Upstream commit 81099f97bd31e25ff2719a435b1860fc3876122f ]

Properly sort all the entries by vendor id.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent d187d947

drivers/usb/core/quirks.c

+10 −10
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* 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 },
@@ -167,6 +170,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* 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 },
@@ -182,16 +189,6 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ 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 },
@@ -202,6 +199,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* 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 */

};