Commit 2ab2178c authored Jul 05, 2009 by Jonathan McDowell Committed by Greg Kroah-Hartman Jul 12, 2009

USB: Fix option_ms regression in 2.6.31-rc2



Commit 32ebbe7b 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>

parent 04950737

drivers/usb/storage/option_ms.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,9 @@ static int option_inquiry(struct us_data *us)

		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,