| From c4815c524eace32d89b81469a71f47f293f44278 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 23:43:03 +0200 |
| Subject: [PATCH] usb: ftdi-elan: Convert "mutex" to semaphore |
| |
| commit c4815c524eace32d89b81469a71f47f293f44278 in tip. |
| |
| The "mutex" ftdi->sw_lock is used as a lock and a completion. Convert |
| it to a real semaphore which allows both. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c |
| index 9d0675e..d20cb67 100644 |
| --- a/drivers/usb/misc/ftdi-elan.c |
| +++ b/drivers/usb/misc/ftdi-elan.c |
| @@ -2766,7 +2766,7 @@ static int ftdi_elan_probe(struct usb_interface *interface, |
| ftdi->sequence_num = ++ftdi_instances; |
| mutex_unlock(&ftdi_module_lock); |
| ftdi_elan_init_kref(ftdi); |
| - init_MUTEX(&ftdi->sw_lock); |
| + semaphore_init(&ftdi->sw_lock); |
| ftdi->udev = usb_get_dev(interface_to_usbdev(interface)); |
| ftdi->interface = interface; |
| mutex_init(&ftdi->u132_lock); |
| -- |
| 1.7.1.1 |
| |