From b81241acfa5c776550944d8fc92e2aad2a5f578b Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 7 Sep 2010 14:32:43 +0000 Subject: [PATCH] --- yaml --- r: 213559 b: refs/heads/master c: 5014b5e33a5485ab669ce536078c957ec221ade3 h: refs/heads/master i: 213557: aa355e725525181b649281dddd7639e3e0a53290 213555: 07d7fb82aebd0a4237b795b2ca19dcfffb3e4a6e 213551: 7aff6345e8dc745d0f7140bc904da22e1b9df2cc v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/ftdi-elan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5fc0e221e8f..376e0cf86891 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1df4e45c81ec9ae6b537f845db48b82ab40ac4f +refs/heads/master: 5014b5e33a5485ab669ce536078c957ec221ade3 diff --git a/trunk/drivers/usb/misc/ftdi-elan.c b/trunk/drivers/usb/misc/ftdi-elan.c index aecf380f6ecc..c8eec9c2d89e 100644 --- a/trunk/drivers/usb/misc/ftdi-elan.c +++ b/trunk/drivers/usb/misc/ftdi-elan.c @@ -2769,7 +2769,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); + sema_init(&ftdi->sw_lock, 1); ftdi->udev = usb_get_dev(interface_to_usbdev(interface)); ftdi->interface = interface; mutex_init(&ftdi->u132_lock);