mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] Fix option_ms regression in 2.6.31-rc2
@ 2009-07-05 11:29 Jonathan McDowell
  0 siblings, 0 replies; only message in thread
From: Jonathan McDowell @ 2009-07-05 11:29 UTC (permalink / raw)
  To: Josua Dietze, Alan Stern, Greg Kroah-Hartman
  Cc: usb-storage, linux-usb, linux-kernel

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@earth.li>

-----
--- 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.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-07-05 12:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-05 11:29 [PATCH] Fix option_ms regression in 2.6.31-rc2 Jonathan McDowell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®