Greg:
This fairly trivial patch makes three small changes:
Correct a typo in a comment.
Don't print a debugging message when a USB mass-storage device
uses the standard signature (the one we would expect normally).
Shorten a debugging message and add a newline.
Please apply.
Alan Stern
Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
===== drivers/usb/storage/scsiglue.c 1.94 vs edited =====
--- 1.94/drivers/usb/storage/scsiglue.c 2005-01-30 20:02:07 -05:00
+++ edited/drivers/usb/storage/scsiglue.c 2005-02-10 16:22:46 -05:00
@@ -149,7 +149,7 @@
sdev->skip_ms_page_3f = 1;
#endif
- /* Some disks return the total number blocks in response
+ /* Some disks return the total number of blocks in response
* to READ CAPACITY rather than the highest block number.
* If this device makes that mistake, tell the sd driver. */
if (us->flags & US_FL_FIX_CAPACITY)
===== drivers/usb/storage/transport.c 1.159 vs edited =====
--- 1.159/drivers/usb/storage/transport.c 2005-02-01 13:10:26 -05:00
+++ edited/drivers/usb/storage/transport.c 2005-02-10 16:31:57 -05:00
@@ -1066,10 +1066,11 @@
*/
if (!us->bcs_signature) {
us->bcs_signature = bcs->Signature;
- US_DEBUGP("Learnt BCS signature 0x%08X\n",
- le32_to_cpu(us->bcs_signature));
+ if (us->bcs_signature != cpu_to_le32(US_BULK_CS_SIGN))
+ US_DEBUGP("Learnt BCS signature 0x%08X\n",
+ le32_to_cpu(us->bcs_signature));
} else if (bcs->Signature != us->bcs_signature) {
- US_DEBUGP("Signature mismatch: device sent %08X, expecting
%08X",
+ US_DEBUGP("Signature mismatch: got %08X, expecting %08X\n",
le32_to_cpu(bcs->Signature),
le32_to_cpu(us->bcs_signature));
return USB_STOR_TRANSPORT_ERROR;
===== drivers/usb/storage/transport.h 1.46 vs edited =====
--- 1.46/drivers/usb/storage/transport.h 2005-02-01 12:58:13 -05:00
+++ edited/drivers/usb/storage/transport.h 2005-02-10 16:25:42 -05:00
@@ -107,6 +107,7 @@
};
#define US_BULK_CS_WRAP_LEN 13
+#define US_BULK_CS_SIGN 0x53425355 /* spells out 'USBS' */
#define US_BULK_STAT_OK 0
#define US_BULK_STAT_FAIL 1
#define US_BULK_STAT_PHASE 2
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
