Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index b62a28814ebe..bd3f415893d8 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -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. */