diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:41:57 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:41:57 -0500 |
| commit | d28c145debb1bd53cde63ac8bccc192e3e00067e (patch) | |
| tree | 87fb1d66cab7689aa662ebd0337b39ff1bf6f433 /include/linux/usb.h | |
| parent | 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 (diff) | |
| parent | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (diff) | |
Merge branch 'sh/driver-core' into sh/clkfwk
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 3492abf82e75..8c9f053111bb 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -512,9 +512,9 @@ extern struct usb_device *usb_get_dev(struct usb_device *dev); | |||
| 512 | extern void usb_put_dev(struct usb_device *dev); | 512 | extern void usb_put_dev(struct usb_device *dev); |
| 513 | 513 | ||
| 514 | /* USB device locking */ | 514 | /* USB device locking */ |
| 515 | #define usb_lock_device(udev) down(&(udev)->dev.sem) | 515 | #define usb_lock_device(udev) device_lock(&(udev)->dev) |
| 516 | #define usb_unlock_device(udev) up(&(udev)->dev.sem) | 516 | #define usb_unlock_device(udev) device_unlock(&(udev)->dev) |
| 517 | #define usb_trylock_device(udev) down_trylock(&(udev)->dev.sem) | 517 | #define usb_trylock_device(udev) device_trylock(&(udev)->dev) |
| 518 | extern int usb_lock_device_for_reset(struct usb_device *udev, | 518 | extern int usb_lock_device_for_reset(struct usb_device *udev, |
| 519 | const struct usb_interface *iface); | 519 | const struct usb_interface *iface); |
| 520 | 520 | ||