diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 19:14:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 19:14:58 +1100 |
| commit | 23b1332e2567c2323b4cfb58f8c18b300ddc4acb (patch) | |
| tree | 5be09ecc0d95cdfd9824e53c1e26bdb4e0b91453 /drivers/usb | |
| parent | 464ceb8f3a3ea5dc66693ec041eb6f3836e5a2ec (diff) | |
| parent | 3d6a19dedd4712777dacce1200ce31c4ac40a42a (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
drivers/base/power/main.c
drivers/pcmcia/ds.c
include/linux/device.h
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/driver.c | 4 | ||||
| -rw-r--r-- | drivers/usb/core/usb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index f2f055eb6831..743da6e54098 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -470,10 +470,10 @@ void usb_driver_release_interface(struct usb_driver *driver, if (device_is_registered(dev)) { device_release_driver(dev); } else { - down(&dev->sem); + device_lock(dev); usb_unbind_interface(dev); dev->driver = NULL; - up(&dev->sem); + device_unlock(dev); } } EXPORT_SYMBOL_GPL(usb_driver_release_interface); diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 0daff0d968ba..d9ebe7c69486 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -601,7 +601,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 */ |