USB: Fix option_ms regression in 2.6.31-rc2

Commit 32ebbe7b6a 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@earth.li>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan McDowell 2009-07-05 12:29:51 +01:00 committed by Greg Kroah-Hartman
parent 04950737d6
commit 2ab2178c33

View File

@ -118,6 +118,9 @@ static int option_inquiry(struct us_data *us)
result = memcmp(buffer+8, "Option", 6); result = memcmp(buffer+8, "Option", 6);
if (result != 0)
result = memcmp(buffer+8, "ZCOPTION", 8);
/* Read the CSW */ /* Read the CSW */
usb_stor_bulk_transfer_buf(us, usb_stor_bulk_transfer_buf(us,
us->recv_bulk_pipe, us->recv_bulk_pipe,