From tglx@linutronix.de Tue Sep 7 19:17:28 2010 From: Thomas Gleixner Date: Tue, 07 Sep 2010 14:32:43 -0000 Subject: usb: ftdi-elan: Convert "mutex" to semaphore Cc: Andrew Morton , Ingo Molnar , Peter Zijlstra , Christoph Hellwig , Greg Kroah-Hartman , linux-usb@vger.kernel.org Message-ID: <20100907125055.947634394@linutronix.de> Content-Disposition: inline; filename=drivers-usb-ftdi-elan-sema.patch 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/ftdi-elan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c @@ -2769,7 +2769,7 @@ static int ftdi_elan_probe(struct usb_in ftdi->sequence_num = ++ftdi_instances; mutex_unlock(&ftdi_module_lock); ftdi_elan_init_kref(ftdi); - init_MUTEX(&ftdi->sw_lock); + sema_init(&ftdi->sw_lock, 1); ftdi->udev = usb_get_dev(interface_to_usbdev(interface)); ftdi->interface = interface; mutex_init(&ftdi->u132_lock);