From d1820412130ee5128bcdfb8b90e342853db7e35f Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Thu, 3 May 2007 20:15:14 -0700 Subject: [PATCH] --- yaml --- r: 55871 b: refs/heads/master c: 9f7afa6b3405a2ceb9403153357564a93f14cde8 h: refs/heads/master i: 55869: fe04f23866935fc26389b0a54c4a35bf24765a23 55867: 3aa13e93d5e8ea10750265e491dcab2f86b194c3 55863: 535b8345994825639f8fb8370ce98978b4e0cc07 55855: c8890d42bcb3cc47ce5dd98fd374c5fba697f657 55839: 8be746fccc71c4639bcd6bdf4f05fabf1105c883 55807: d3f5cf87e89bd4929addd0b5f43027bdb2f09f06 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/pcwd_usb.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1d83e70589a3..6dbd2eb168ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbf379ea9ae878bf88d2b3cf8f74ce4536e25d19 +refs/heads/master: 9f7afa6b3405a2ceb9403153357564a93f14cde8 diff --git a/trunk/drivers/char/watchdog/pcwd_usb.c b/trunk/drivers/char/watchdog/pcwd_usb.c index 31037f9c9ffe..1e7a6719d5ba 100644 --- a/trunk/drivers/char/watchdog/pcwd_usb.c +++ b/trunk/drivers/char/watchdog/pcwd_usb.c @@ -146,7 +146,7 @@ struct usb_pcwd_private { atomic_t cmd_received; /* true if we received a report after a command */ int exists; /* Wether or not the device exists */ - struct semaphore sem; /* locks this structure */ + struct mutex mtx; /* locks this structure */ }; static struct usb_pcwd_private *usb_pcwd_device; @@ -635,7 +635,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi usb_pcwd_device = usb_pcwd; - init_MUTEX (&usb_pcwd->sem); + mutex_init(&usb_pcwd->mtx); usb_pcwd->udev = udev; usb_pcwd->interface = interface; usb_pcwd->interface_number = iface_desc->desc.bInterfaceNumber; @@ -763,7 +763,7 @@ static void usb_pcwd_disconnect(struct usb_interface *interface) usb_pcwd = usb_get_intfdata (interface); usb_set_intfdata (interface, NULL); - down (&usb_pcwd->sem); + mutex_lock(&usb_pcwd->mtx); /* Stop the timer before we leave */ if (!nowayout) @@ -777,7 +777,7 @@ static void usb_pcwd_disconnect(struct usb_interface *interface) misc_deregister(&usb_pcwd_temperature_miscdev); unregister_reboot_notifier(&usb_pcwd_notifier); - up (&usb_pcwd->sem); + mutex_unlock(&usb_pcwd->mtx); /* Delete the USB PCWD device */ usb_pcwd_delete(usb_pcwd);