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

Commit 14f3546f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: spruce up the device blacklist 



This patch (as1040) fixes up the blacklist of USB device quirks.  A
couple of lines are broken to comply with the 80-column rule, and
entries are sorted into the proper numerical order.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d6d914f5

drivers/usb/core/quirks.c

+12 −9
Original line number Diff line number Diff line
@@ -28,35 +28,38 @@ 
 * devices is broken...

 */

static const struct usb_device_id usb_quirk_list[] = {

	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255},



	/* CBM - Flash disk */

	{ USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },



	/* HP 5300/5370C scanner */

	{ USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },

	{ USB_DEVICE(0x03f0, 0x0701), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },



	/* Creative SB Audigy 2 NX */

	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Philips PSC805 audio device */

	{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Roland SC-8820 */

	{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Edirol SD-20 */

	{ USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },



	/* INTEL VALUE SSD */

	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },



	/* M-Systems Flash Disk Pioneers */

	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Philips PSC805 audio device */

	{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },

	/* Action Semiconductor flash disk */

	{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

			USB_QUIRK_STRING_FETCH_255 },



	/* SKYMEDI USB_DRIVE */

	{ USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },



	/* INTEL VALUE SSD */

	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },



	{ }  /* terminating entry must be last */

};