From fd515513a38b53d2b961cbbc9c4fdaeedec74d44 Mon Sep 17 00:00:00 2001 From: Velempati Chiranjeevi Date: Wed, 21 Oct 2009 09:53:10 +0530 Subject: [PATCH] USB: android gadget: mass storage: Fix format issue for Vista Host As part of formating the mass storage device, Host sends the INQUIRY scsi command. As per the standard, the command length for this command should be 6 bytes, whereas the Vista host sends 12 bytes. When the command length of the command is not equal to the standard length, the device sends a phase error as part of the status phase. When the host receives a phase error, it re-enumerates, hence the error. If the command is INQUIRY, and the command length is 12 bytes, treating this as a good command and not sending the phase error to the host fixes this issue. Signed-off-by: Velempati Chiranjeevi Signed-off-by: Mike Lockwood --- drivers/usb/gadget/f_mass_storage.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index ca85cc01e9f8..72a6a1087aaa 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -1740,9 +1740,10 @@ static int check_command(struct fsg_dev *fsg, int cmnd_size, /* Verify the length of the command itself */ if (cmnd_size != fsg->cmnd_size) { - /* Special case workaround: MS-Windows issues REQUEST SENSE - * with cbw->Length == 12 (it should be 6). */ - if (fsg->cmnd[0] == SC_REQUEST_SENSE && fsg->cmnd_size == 12) + /* Special case workaround: MS-Windows issues REQUEST_SENSE + * and INQUIRY commands with cbw->Length == 12 (it should be 6). */ + if ((fsg->cmnd[0] == SC_REQUEST_SENSE && fsg->cmnd_size == 12) + || (fsg->cmnd[0] == SC_INQUIRY && fsg->cmnd_size == 12)) cmnd_size = fsg->cmnd_size; else { fsg->phase_error = 1; -- 2.34.1