diff options
| author | Jonathan McDowell <noodles@earth.li> | 2009-07-05 12:29:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-12 15:16:40 -0700 |
| commit | 2ab2178c3303583a0551f6b6bf4ba070afbf875f (patch) | |
| tree | e34ce6af4e7637a0b6a0703a658f9747fda8c185 /drivers/usb/storage/option_ms.c | |
| parent | 04950737d6bed9d234483216ee36ed760d9404eb (diff) | |
| download | linux-stable-2ab2178c3303583a0551f6b6bf4ba070afbf875f.tar.gz linux-stable-2ab2178c3303583a0551f6b6bf4ba070afbf875f.tar.bz2 linux-stable-2ab2178c3303583a0551f6b6bf4ba070afbf875f.zip | |
USB: 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.
Signed-Off-By: Jonathan McDowell <noodles@earth.li>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/option_ms.c')
| -rw-r--r-- | drivers/usb/storage/option_ms.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c index d41cc0a970f7..773a5cd38c5a 100644 --- a/drivers/usb/storage/option_ms.c +++ b/drivers/usb/storage/option_ms.c @@ -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, |