]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
storage: Add quirk for another SCM-based USB-SCSI converter
authorMark Knibbs <markk@clara.co.uk>
Tue, 23 Sep 2014 11:43:02 +0000 (12:43 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 30 Oct 2014 20:31:51 +0000 (21:31 +0100)
commit 3512e7bfea6a459cad84712a021d856bd78cd7e4 upstream.

There is apparently another SCM USB-SCSI converter with ID 04E6:000F. It
is listed along with 04E6:000B in the Windows INF file for the Startech
ICUSBSCSI2 as "eUSB SCSI Adapter (Bus Powered)". The quirk allows
devices with SCSI ID other than 0 to be accessed.

Also make a couple of existing SCM product IDs lower case to be
consistent with other entries.

Signed-off-by: Mark Knibbs <markk@clara.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/usb/storage/unusual_devs.h

index 7f625306ea803d8452db6c70dcaeb505c8f9687a..c8ff1409344a7c26a7d1568bfbf4eed989005d8d 100644 (file)
@@ -492,18 +492,24 @@ UNUSUAL_DEV(  0x04e6, 0x000a, 0x0200, 0x0200,
                "eUSB CompactFlash Adapter",
                USB_SC_8020, USB_PR_CB, NULL, 0),
 
-UNUSUAL_DEV(  0x04e6, 0x000B, 0x0100, 0x0100,
+UNUSUAL_DEV(  0x04e6, 0x000b, 0x0100, 0x0100,
                "Shuttle",
                "eUSCSI Bridge",
                USB_SC_SCSI, USB_PR_BULK, usb_stor_euscsi_init,
                US_FL_SCM_MULT_TARG ), 
 
-UNUSUAL_DEV(  0x04e6, 0x000C, 0x0100, 0x0100,
+UNUSUAL_DEV(  0x04e6, 0x000c, 0x0100, 0x0100,
                "Shuttle",
                "eUSCSI Bridge",
                USB_SC_SCSI, USB_PR_BULK, usb_stor_euscsi_init,
                US_FL_SCM_MULT_TARG ),
 
+UNUSUAL_DEV(  0x04e6, 0x000f, 0x0000, 0x9999,
+               "SCM Microsystems",
+               "eUSB SCSI Adapter (Bus Powered)",
+               USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
+               US_FL_SCM_MULT_TARG ),
+
 UNUSUAL_DEV(  0x04e6, 0x0101, 0x0200, 0x0200,
                "Shuttle",
                "CD-RW Device",