2007-12-29 01:16:44

by Dave Young

[permalink] [raw]
Subject: [PATCH 12/12] usb : Use mutex instead of semaphore in driver core

Signed-off-by: Dave Young <[email protected]>

---
include/linux/usb.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff -upr linux/include/linux/usb.h linux.new/include/linux/usb.h
--- linux/include/linux/usb.h 2007-12-28 10:50:31.000000000 +0800
+++ linux.new/include/linux/usb.h 2007-12-28 10:52:31.000000000 +0800
@@ -441,9 +441,9 @@ extern struct usb_device *usb_get_dev(st
extern void usb_put_dev(struct usb_device *dev);

/* 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_lock_device(udev) mutex_lock(&(udev)->dev.mutex)
+#define usb_unlock_device(udev) mutex_unlock(&(udev)->dev.mutex)
+#define usb_trylock_device(udev) mutex_trylock(&(udev)->dev.mutex)
extern int usb_lock_device_for_reset(struct usb_device *udev,
const struct usb_interface *iface);