[patch] The kernel patch itself

msnc_z6.patch (text/plain), 2.27 KB, created by Constantin Baranov on 2008-03-08 17:04:09 UTC

diff -ur linux-2.6.24/drivers/usb/storage/transport.c linux-2.6.24-msnc_z6/drivers/usb/storage/transport.c
--- linux-2.6.24/drivers/usb/storage/transport.c	2008-01-25 02:58:37.000000000 +0400
+++ linux-2.6.24-msnc_z6/drivers/usb/storage/transport.c	2008-03-08 18:22:00.000000000 +0400
@@ -1010,9 +1010,11 @@
 	US_DEBUGP("Bulk Status S 0x%x T 0x%x R %u Stat 0x%x\n",
 			le32_to_cpu(bcs->Signature), bcs->Tag, 
 			residue, bcs->Status);
-	if (bcs->Tag != us->tag || bcs->Status > US_BULK_STAT_PHASE) {
-		US_DEBUGP("Bulk logical error\n");
-		return USB_STOR_TRANSPORT_ERROR;
+	if (!(us->flags & US_FL_BULK_IGNORE_TAG)) {
+		if (bcs->Tag != us->tag || bcs->Status > US_BULK_STAT_PHASE) {
+			US_DEBUGP("Bulk logical error\n");
+			return USB_STOR_TRANSPORT_ERROR;
+		}
 	}
 
 	/* Some broken devices report odd signatures, so we do not check them
diff -ur linux-2.6.24/drivers/usb/storage/unusual_devs.h linux-2.6.24-msnc_z6/drivers/usb/storage/unusual_devs.h
--- linux-2.6.24/drivers/usb/storage/unusual_devs.h	2008-01-25 02:58:37.000000000 +0400
+++ linux-2.6.24-msnc_z6/drivers/usb/storage/unusual_devs.h	2008-03-08 18:36:43.000000000 +0400
@@ -1,3 +1,4 @@
+
 /* Driver for USB Mass Storage compliant devices
  * Unusual Devices File
  *
@@ -1549,6 +1550,16 @@
 		US_SC_DEVICE, US_PR_DEVICE, NULL,
 		US_FL_FIX_CAPACITY),
 
+/*
+ * Patch by Constantin Baranov <[e-mail]>
+ * Reported by Andreas Koenecke
+ */
+UNUSUAL_DEV(  0x22b8, 0x6426, 0x0101, 0x0101,
+		"Motorola",
+		"MSnc.",
+		US_SC_DEVICE, US_PR_DEVICE, NULL,
+		US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY | US_FL_BULK_IGNORE_TAG ),
+
 /* Reported by Radovan Garabik <[e-mail]> */
 UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,
 		"MPIO",
diff -ur linux-2.6.24/include/linux/usb_usual.h linux-2.6.24-msnc_z6/include/linux/usb_usual.h
--- linux-2.6.24/include/linux/usb_usual.h	2008-01-25 02:58:37.000000000 +0400
+++ linux-2.6.24-msnc_z6/include/linux/usb_usual.h	2008-03-08 17:56:44.000000000 +0400
@@ -23,6 +23,8 @@
  * proc_info() routine can automatically display a message for each flag.
  */
 #define US_DO_ALL_FLAGS						\
+	US_FLAG(BULK_IGNORE_TAG,0x80000000)			\
+		/* Ignore tag mismatch in bulk operations */	\
 	US_FLAG(SINGLE_LUN,	0x00000001)			\
 		/* allow access to only LUN 0 */		\
 	US_FLAG(NEED_OVERRIDE,	0x00000002)			\