[PATCH] USB: convert a bunch of USB semaphores to mutexes
the patch below converts a bunch of semaphores-used-as-mutex in the USB code to mutexes Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
35cce732d9
commit
4186ecf8ad
@@ -83,6 +83,7 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/completion.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/poll.h>
|
||||
@@ -256,7 +257,7 @@ static void tower_disconnect (struct usb_interface *interface);
|
||||
|
||||
|
||||
/* prevent races between open() and disconnect */
|
||||
static DECLARE_MUTEX (disconnect_sem);
|
||||
static DEFINE_MUTEX (disconnect_mutex);
|
||||
|
||||
/* file operations needed when we register this driver */
|
||||
static struct file_operations tower_fops = {
|
||||
@@ -349,7 +350,7 @@ static int tower_open (struct inode *inode, struct file *file)
|
||||
nonseekable_open(inode, file);
|
||||
subminor = iminor(inode);
|
||||
|
||||
down (&disconnect_sem);
|
||||
mutex_lock (&disconnect_mutex);
|
||||
|
||||
interface = usb_find_interface (&tower_driver, subminor);
|
||||
|
||||
@@ -427,7 +428,7 @@ unlock_exit:
|
||||
up (&dev->sem);
|
||||
|
||||
unlock_disconnect_exit:
|
||||
up (&disconnect_sem);
|
||||
mutex_unlock (&disconnect_mutex);
|
||||
|
||||
dbg(2, "%s: leave, return value %d ", __FUNCTION__, retval);
|
||||
|
||||
@@ -1005,7 +1006,7 @@ static void tower_disconnect (struct usb_interface *interface)
|
||||
|
||||
dbg(2, "%s: enter", __FUNCTION__);
|
||||
|
||||
down (&disconnect_sem);
|
||||
mutex_lock (&disconnect_mutex);
|
||||
|
||||
dev = usb_get_intfdata (interface);
|
||||
usb_set_intfdata (interface, NULL);
|
||||
@@ -1027,7 +1028,7 @@ static void tower_disconnect (struct usb_interface *interface)
|
||||
up (&dev->sem);
|
||||
}
|
||||
|
||||
up (&disconnect_sem);
|
||||
mutex_unlock (&disconnect_mutex);
|
||||
|
||||
info("LEGO USB Tower #%d now disconnected", (minor - LEGO_USB_TOWER_MINOR_BASE));
|
||||
|
||||
|
Reference in New Issue
Block a user