USB: storage: fix misplaced parenthesis
authorRoel Kluin <roel.kluin@gmail.com>
Wed, 17 Feb 2010 10:50:26 +0000 (11:50 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 2 Mar 2010 22:55:08 +0000 (14:55 -0800)
Due to a misplaced parenthesis the usbat_write_block() return value was not
stored, but a boolean. USB_STOR_TRANSPORT_NO_SENSE and USB_STOR_TRANSPORT_ERROR
were returned as USB_STOR_TRANSPORT_FAILED.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/storage/shuttle_usbat.c

index b62a28814ebeaec12d0a1989c433f0c067572ce9..bd3f415893d81f3ffd76d77cd6fe64f8739035ba 100644 (file)
@@ -1628,10 +1628,10 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
                return USB_STOR_TRANSPORT_ERROR;
        }
 
-       if ( (result = usbat_multiple_write(us, 
-                       registers, data, 7)) != USB_STOR_TRANSPORT_GOOD) {
+       result = usbat_multiple_write(us, registers, data, 7);
+
+       if (result != USB_STOR_TRANSPORT_GOOD)
                return result;
-       }
 
        /*
         * Write the 12-byte command header.
@@ -1643,12 +1643,11 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
         * AT SPEED 4 IS UNRELIABLE!!!
         */
 
-       if ((result = usbat_write_block(us,
-                       USBAT_ATA, srb->cmnd, 12,
-                               (srb->cmnd[0]==GPCMD_BLANK ? 75 : 10), 0) !=
-                            USB_STOR_TRANSPORT_GOOD)) {
+       result = usbat_write_block(us, USBAT_ATA, srb->cmnd, 12,
+                                  srb->cmnd[0] == GPCMD_BLANK ? 75 : 10, 0);
+
+       if (result != USB_STOR_TRANSPORT_GOOD)
                return result;
-       }
 
        /* If there is response data to be read in then do it here. */