down_trylock -> down_try for usb_trylock_device() I took the liberty of reversing the sense of usb_trylock_device(): it only has one user anyway. Signed-off-by: Rusty Russell --- drivers/usb/core/usb.c | 2 +- include/linux/usb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -r fd52ad67b911 drivers/usb/core/usb.c --- a/drivers/usb/core/usb.c Tue May 06 10:17:33 2008 +1000 +++ b/drivers/usb/core/usb.c Tue May 06 10:26:56 2008 +1000 @@ -477,7 +477,7 @@ int usb_lock_device_for_reset(struct usb } } - 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 */ diff -r fd52ad67b911 include/linux/usb.h --- a/include/linux/usb.h Tue May 06 10:17:33 2008 +1000 +++ b/include/linux/usb.h Tue May 06 10:26:56 2008 +1000 @@ -491,7 +491,7 @@ extern void usb_put_dev(struct usb_devic /* USB device locking */ #define usb_lock_device(udev) down(&(udev)->dev.sem) #define usb_unlock_device(udev) up(&(udev)->dev.sem) -#define usb_trylock_device(udev) down_trylock(&(udev)->dev.sem) +#define usb_trylock_device(udev) down_try(&(udev)->dev.sem) extern int usb_lock_device_for_reset(struct usb_device *udev, const struct usb_interface *iface);