diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:08:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:08:05 +1000 |
| commit | 2870f66154a12ea2869ab8fd138d9fdb2655ca92 (patch) | |
| tree | 733df103d777e12d1cff413874756c127e4b81d7 /drivers/usb/core | |
| parent | 0e21a3562aec5758573c77d360bd8cd70f9096ec (diff) | |
| parent | 75f38eb4ffc0537ef3c6212920bc2b87a0f183d8 (diff) | |
Merge branch 'quilt/rr'
Diffstat (limited to 'drivers/usb/core')
| -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 84fcaa6a21ec..f31f0c5d3725 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -477,7 +477,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 */ |