diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /drivers/block/ub.c | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'drivers/block/ub.c')
| -rw-r--r-- | drivers/block/ub.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 048d71d244d..12fb816db7b 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); } } |