Revert "USB: android gadget: mass storage: Fix format issue for Vista Host"

This reverts commit fd515513a38b53d2b961cbbc9c4fdaeedec74d44.

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 72a6a1087aaaf18f5a5681c0ddf927d51f6b91e0..ca85cc01e9f873c0f42f8584321982daf3b1855c 100755 (executable)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -1740,10 +1740,9 @@ 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
-                * 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))
+               /* 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)
                        cmnd_size = fsg->cmnd_size;
                else {
                        fsg->phase_error = 1;