Matthew Dharm writes: > > Attached to this message is a patch for usb-storage against > 2.4.18-rc4. > Please apply. > [snip-ola]
Matt,
Here is an updated patch which adds ScanLogic USB devices
reported by myself, Rene Engelhard, Peter W�chtler, Dylan Egan, and Ashley
Pittman.
This was originally submitted Jan 10th.
Dave Jones placed it in his patchset for 2.5.2-dj3, and it has been in there
ever since. I've been monitoring for any negative feedback, and there has
been none -- only positive (it makes things work!)
Please apply. (fwiw, it will apply to 2.5.5, with or without your above
patch)
Thanks.
Leif
diff -u --recursive linux-2.4.18-rc4/drivers/usb/storage/transport.c
linux/drivers/usb/storage/transport.c
--- linux-2.4.18-rc4/drivers/usb/storage/transport.c Mon Feb 25 09:26:16
2002
+++ linux/drivers/usb/storage/transport.c Mon Feb 25 09:22:09 2002
@@ -1198,7 +1198,7 @@
le32_to_cpu(bcs.Signature), bcs.Tag,
bcs.Residue, bcs.Status);
if (bcs.Signature != cpu_to_le32(US_BULK_CS_SIGN) ||
- bcs.Tag != bcb.Tag ||
+ ((bcs.Tag != bcb.Tag ) && (!(us->flags & US_FL_SL_IDE_BUG))) ||
bcs.Status > US_BULK_STAT_PHASE || partial != 13) {
US_DEBUGP("Bulk logical error\n");
return USB_STOR_TRANSPORT_ERROR;
Only in linux/drivers/usb/storage: transport.c.orig
diff -u --recursive linux-2.4.18-rc4/drivers/usb/storage/unusual_devs.h
linux/drivers/usb/storage/unusual_devs.h
--- linux-2.4.18-rc4/drivers/usb/storage/unusual_devs.h Mon Feb 25 09:26:16
2002
+++ linux/drivers/usb/storage/unusual_devs.h Mon Feb 25 09:22:09 2002
@@ -110,6 +110,28 @@
"LS-120 Camera",
US_SC_UFI, US_PR_CBI, NULL, 0),
+/* Reported by Peter W�chtler <[EMAIL PROTECTED]> */
+UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074,
+ "ScanLogic",
+ "SL11R-IDE 0049SQFP-1.2 A002",
+ US_SC_SCSI, US_PR_BULK, NULL,
+ US_FL_FIX_INQUIRY ),
+
+/* Reported by Leif Sawyer <[EMAIL PROTECTED]> */
+UNUSUAL_DEV( 0x04ce, 0x0002, 0x0240, 0x0240,
+ "H45 ScanLogic",
+ "SL11R-IDE 9951SQFP-1.2 K004",
+ US_SC_SCSI, US_PR_BULK, NULL,
+ US_FL_FIX_INQUIRY | US_FL_SL_IDE_BUG ),
+
+/* Reported by Rene Engelhard <[EMAIL PROTECTED]> and
+ Dylan Egan <[EMAIL PROTECTED]> */
+UNUSUAL_DEV( 0x04ce, 0x0002, 0x0260, 0x0260,
+ "ScanLogic",
+ "SL11R-IDE unknown HW rev",
+ US_SC_SCSI, US_PR_BULK, NULL,
+ US_FL_SL_IDE_BUG ),
+
/* Most of the following entries were developed with the help of
* Shuttle/SCM directly.
*/
diff -u --recursive linux-2.4.18-rc4/drivers/usb/storage/usb.h
linux/drivers/usb/storage/usb.h
--- linux-2.4.18-rc4/drivers/usb/storage/usb.h Mon Feb 25 09:26:16 2002
+++ linux/drivers/usb/storage/usb.h Mon Feb 25 09:22:09 2002
@@ -101,6 +101,7 @@
#define US_FL_IGNORE_SER 0x00000010 /* Ignore the serial number given
*/
#define US_FL_SCM_MULT_TARG 0x00000020 /* supports multiple targets */
#define US_FL_FIX_INQUIRY 0x00000040 /* INQUIRY response needs fixing
*/
+#define US_FL_SL_IDE_BUG 0x00000100 /* ScanLogic usb-ide workaround */
#define USB_STOR_STRING_LEN 32
usbat.patch-2.4.18-rc4
Description: Binary data
