Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 885867a86de8..4541dfcea88f 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -350,17 +350,16 @@ static int mts_scsi_abort(struct scsi_cmnd *srb)
 static int mts_scsi_host_reset(struct scsi_cmnd *srb)
 {
         struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
-        int result, rc;
+        int result;
 
         MTS_DEBUG_GOT_HERE();
         mts_debug_dump(desc);
 
-        rc = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf);
-        if (rc < 0)
-                return FAILED;
-        result = usb_reset_device(desc->usb_dev);
-        if (rc)
+        result = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf);
+        if (result == 0) {
+                result = usb_reset_device(desc->usb_dev);
                 usb_unlock_device(desc->usb_dev);
+        }
         return result ? FAILED : SUCCESS;
 }