diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-24 06:25:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-24 06:25:54 -0400 |
| commit | 5f9ece02401116b29eb04396b99ea092acb75dd8 (patch) | |
| tree | e10386e2dc63c275646b4eb0bed857da7bf86c6a /drivers/usb/storage/option_ms.c | |
| parent | 9f51e24ee8b5a1595b6a5ac0c2be278a16488e75 (diff) | |
| parent | 422bef879e84104fee6dc68ded0e371dbeb5f88e (diff) | |
Merge commit 'v2.6.31-rc7' into x86/cleanups
Merge reason: we were on -rc1 before - go up to -rc7
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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) | |||
| 118 | 118 | ||
| 119 | result = memcmp(buffer+8, "Option", 6); | 119 | result = memcmp(buffer+8, "Option", 6); |
| 120 | 120 | ||
| 121 | if (result != 0) | ||
| 122 | result = memcmp(buffer+8, "ZCOPTION", 8); | ||
| 123 | |||
| 121 | /* Read the CSW */ | 124 | /* Read the CSW */ |
| 122 | usb_stor_bulk_transfer_buf(us, | 125 | usb_stor_bulk_transfer_buf(us, |
| 123 | us->recv_bulk_pipe, | 126 | us->recv_bulk_pipe, |