diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-22 16:05:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-22 16:05:42 +1100 |
| commit | 854cef11e9487f1a82a66804b00a673ee6d57fe3 (patch) | |
| tree | 9dfa79458b8d8eb5aacb8c1f6fbebb0cfd1ba8c8 /drivers/usb/core/usb.c | |
| parent | 01c9931a25e493fc4a3b634657081866035fbac7 (diff) | |
| parent | 76b5efb35f163567d24cb05cfc4be5d1cb90008e (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'drivers/usb/core/usb.c')
| -rw-r--r-- | drivers/usb/core/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 1297e9b16a51..0c6581003339 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -573,7 +573,7 @@ int usb_lock_device_for_reset(struct usb_device *udev, iface->condition == USB_INTERFACE_UNBOUND)) return -EINTR; - while (usb_trylock_device(udev) != 0) { + while (!usb_trylock_device(udev)) { /* If we can't acquire the lock after waiting one second, * we're probably deadlocked */ |