Skip to contentSkip to conversation

Fix option_ms regression in 2.6.31-rc2

PATCH New Jonathan McDowell 1 participant 1 message Jul 5, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix option_ms regression in 2.6.31-rc2

Commit 32ebbe7b6ad44ae9c276419710b56de6ba705303 which filters the SCSI REZERO command in option_ms based on a SCSI INQUIRY with a vendor of Option breaks my Option Icon 225 (0af0:6971). This device returns a vendor of ZCOPTION for the ZeroCD device. The following trivial patch fixes things for me.

-----

drivers/usb/storage/option_ms.c renamed from drivers/usb/storage/option_ms.c.orig +3 -0
@@ -118,6 +118,9 @@ static int option_inquiry(struct us_data
 
 	result = memcmp(buffer+8, "Option", 6);
 
+	if (result != 0)
+		result = memcmp(buffer+8, "ZCOPTION", 8);
+
 	/* Read the CSW */
 	usb_stor_bulk_transfer_buf(us,
 			us->recv_bulk_pipe,

-----

J.

Signature · 4 lines
   Nice computers don't go down.   |  .''`.  Debian GNU/Linux Developer
                                   | : :' :  Happy to accept PGP signed
                                   | `. `'   or encrypted mail - RSA
                                   |   `-    key on the keyservers.