1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 048d71d244d7..12fb816db7b0 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1579,7 +1579,7 @@ static void ub_reset_task(struct work_struct *work)
         struct ub_dev *sc = container_of(work, struct ub_dev, reset_work);
         unsigned long flags;
         struct ub_lun *lun;
-        int lkr, rc;
+        int rc;
 
         if (!sc->reset) {
                 printk(KERN_WARNING "%s: Running reset unrequested\n",
@@ -1597,10 +1597,11 @@ static void ub_reset_task(struct work_struct *work)
         } else if (sc->dev->actconfig->desc.bNumInterfaces != 1) {
                 ;
         } else {
-                if ((lkr = usb_lock_device_for_reset(sc->dev, sc->intf)) < 0) {
+                rc = usb_lock_device_for_reset(sc->dev, sc->intf);
+                if (rc < 0) {
                         printk(KERN_NOTICE
                             "%s: usb_lock_device_for_reset failed (%d)\n",
-                            sc->name, lkr);
+                            sc->name, rc);
                 } else {
                         rc = usb_reset_device(sc->dev);
                         if (rc < 0) {
@@ -1608,9 +1609,7 @@ static void ub_reset_task(struct work_struct *work)
                                     "usb_lock_device_for_reset failed (%d)\n",
                                     sc->name, rc);
                         }
-
-                        if (lkr)
-                                usb_unlock_device(sc->dev);
+                        usb_unlock_device(sc->dev);
                 }
         }