[PATCH] Fix option_ms regression in 2.6.31-rc2

From: Jonathan McDowell
Date: Sun Jul 05 2009 - 08:19:15 EST


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.

Signed-Off-By: Jonathan McDowell <noodles@xxxxxxxx>

-----
--- linux-2.6.31-rc2/drivers/usb/storage/option_ms.c.orig 2009-07-05 11:48:19.000000000 +0100
+++ linux-2.6.31-rc2/drivers/usb/storage/option_ms.c 2009-07-05 11:50:59.000000000 +0100
@@ -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.

--
Nice computers don't go down. | .''`. Debian GNU/Linux Developer
| : :' : Happy to accept PGP signed
| `. `' or encrypted mail - RSA
| `- key on the keyservers.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/