summaryrefslogtreecommitdiff
path: root/drivers/usb/core/usb.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-05-21 13:21:21 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-05-21 13:21:21 +1000
commitd431d22845687156a6b94bcabfead21a3861133a (patch)
tree49b79140e362c7d4af4d187dbde2a05cc59810da /drivers/usb/core/usb.c
parent2bf6d8d1c8139a867d7ba33d459997140c462006 (diff)
parente134ef0ee336ea385f04799473982119dee9cca9 (diff)
Merge branch 'quilt/rr'
Diffstat (limited to 'drivers/usb/core/usb.c')
-rw-r--r--drivers/usb/core/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 325774375837..2f76846e1c60 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -478,7 +478,7 @@ int usb_lock_device_for_reset(struct usb_device *udev,
}
}
- 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 */