Sophie

Sophie

distrib > Mandriva > current > x86_64 > by-pkgid > 1d324c235dc233b745534bb4838342f0 > files > 1

dkms-fcusb2-3.11.07-6mdv2008.1.src.rpm

DECLARE_MUTEX_LOCKED doesn't exit anymore, declare semaphore explicitly
and use sema_init like on commit 04fc8bbcf5eb25fa2aec290b302a9878dde20168
on Linus tree. Also removed the unused items.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>

--- fcusb2-3.11.07.orig/driver.c	2008-01-10 23:18:04.000000000 -0200
+++ fcusb2-3.11.07/driver.c	2008-01-10 23:38:39.000000000 -0200
@@ -92,8 +92,7 @@ static DECLARE_WAIT_QUEUE_HEAD(wait);
 static DECLARE_WAIT_QUEUE_HEAD(capi_wait);
 static DECLARE_WAIT_QUEUE_HEAD(tx_wait);
 static DECLARE_WAIT_QUEUE_HEAD(rx_wait);
-static DECLARE_MUTEX_LOCKED(hotplug);
-static DECLARE_MUTEX_LOCKED(notify);
+static struct semaphore hotplug;
 
 #define	SCHED_WAKEUP_CAPI	{ atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); }
 #define	SCHED_WAKEUP		{ atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); }
@@ -631,6 +630,7 @@ static int kcapi_init (struct usb_device
 		ERROR("Cannot handle two controllers!\n");
  		return -EBUSY;
 	}
+	sema_init (&hotplug, 0);
 	ctrl = &capi_card->ctr;
 	
 	ctrl->driver_name = TARGET;