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

Commit ed3e8fca authored by Phil Dibowitz's avatar Phil Dibowitz Committed by Greg Kroah-Hartman
Browse files

USB: Fix unusual_devs.h ordering 



This patch fixes ordering problems with entries in unusual_devs.h.

Signed-off-by: default avatarPhil Dibowitz <phil@ipom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6149ed5e

drivers/usb/storage/unusual_devs.h

+25 −26
Original line number Diff line number Diff line
@@ -401,6 +401,14 @@ UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_IGNORE_RESIDUE ),



#ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB

UNUSUAL_DEV(  0x04b4, 0x6830, 0x0000, 0x9999,

		"Cypress",

		"Cypress AT2LP",

		US_SC_CYP_ATACB, US_PR_BULK, NULL,

		0),

#endif



/* Reported by Simon Levitt <simon@whattf.com>

 * This entry needs Sub and Proto fields */

UNUSUAL_DEV(  0x04b8, 0x0601, 0x0100, 0x0100,
@@ -539,17 +547,6 @@ UNUSUAL_DEV( 0x04e6, 0x0101, 0x0200, 0x0200, 
		"CD-RW Device",

		US_SC_8020, US_PR_CB, NULL, 0),



/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.

 * Device uses standards-violating 32-byte Bulk Command Block Wrappers and

 * reports itself as "Proprietary SCSI Bulk." Cf. device entry 0x084d:0x0011.

 */



UNUSUAL_DEV(  0x04fc, 0x80c2, 0x0100, 0x0100,

		"Kobian Mercury",

		"Binocam DCB-132",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_BULK32),



#ifdef CONFIG_USB_STORAGE_USBAT

UNUSUAL_DEV(  0x04e6, 0x1010, 0x0000, 0x9999,

		"Shuttle/SCM",
@@ -565,6 +562,16 @@ UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x0220, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_MAX_SECTORS_64),



/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.

 * Device uses standards-violating 32-byte Bulk Command Block Wrappers and

 * reports itself as "Proprietary SCSI Bulk." Cf. device entry 0x084d:0x0011.

 */

UNUSUAL_DEV(  0x04fc, 0x80c2, 0x0100, 0x0100,

		"Kobian Mercury",

		"Binocam DCB-132",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_BULK32),



/* Reported by Bob Sass <rls@vectordb.com> -- only rev 1.33 tested */

UNUSUAL_DEV(  0x050d, 0x0115, 0x0133, 0x0133,

		"Belkin",
@@ -1361,13 +1368,6 @@ UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_INQUIRY),



/* Reported by Rohan Hart <rohan.hart17@gmail.com> */

UNUSUAL_DEV(  0x2770, 0x915d, 0x0010, 0x0010,

		"INTOVA",

		"Pixtreme",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY ),



/*

 * Entry for Jenoptik JD 5200z3

 *
@@ -1731,6 +1731,13 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_GO_SLOW ),



/* Reported by Rohan Hart <rohan.hart17@gmail.com> */

UNUSUAL_DEV(  0x2770, 0x915d, 0x0010, 0x0010,

		"INTOVA",

		"Pixtreme",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY ),



/*

 * David Härdeman <david@2gen.com>

 * The key makes the SCSI stack print confusing (but harmless) messages
@@ -1755,14 +1762,6 @@ UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_CAPACITY_HEURISTICS),



#ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB

UNUSUAL_DEV(  0x04b4, 0x6830, 0x0000, 0x9999,

		"Cypress",

		"Cypress AT2LP",

		US_SC_CYP_ATACB, US_PR_BULK, NULL,

		0),

#endif



/* Control/Bulk transport for all SubClass values */

USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR),

USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR),