1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index d8cde1017985..d0b167256699 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 
@@ -121,7 +122,7 @@ static struct usb_driver idmouse_driver = {
 };
 
 /* prevent races between open() and disconnect() */
-static DECLARE_MUTEX(disconnect_sem);
+static DEFINE_MUTEX(disconnect_mutex);
 
 static int idmouse_create_image(struct usb_idmouse *dev)
 {
@@ -213,18 +214,18 @@ static int idmouse_open(struct inode *inode, struct file *file)
         int result = 0;
 
         /* prevent disconnects */
-        down(&disconnect_sem);
+        mutex_lock(&disconnect_mutex);
 
         /* get the interface from minor number and driver information */
         interface = usb_find_interface (&idmouse_driver, iminor (inode));
         if (!interface) {
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
         /* get the device information block from the interface */
         dev = usb_get_intfdata(interface);
         if (!dev) {
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
@@ -258,7 +259,7 @@ error:
         up(&dev->sem);
 
         /* unlock the disconnect semaphore */
-        up(&disconnect_sem);
+        mutex_unlock(&disconnect_mutex);
         return result;
 }
 
@@ -267,12 +268,12 @@ static int idmouse_release(struct inode *inode, struct file *file)
         struct usb_idmouse *dev;
 
         /* prevent a race condition with open() */
-        down(&disconnect_sem);
+        mutex_lock(&disconnect_mutex);
 
         dev = (struct usb_idmouse *) file->private_data;
 
         if (dev == NULL) {
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
@@ -282,7 +283,7 @@ static int idmouse_release(struct inode *inode, struct file *file)
         /* are we really open? */
         if (dev->open <= 0) {
                 up(&dev->sem);
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return -ENODEV;
         }
 
@@ -292,12 +293,12 @@ static int idmouse_release(struct inode *inode, struct file *file)
                 /* the device was unplugged before the file was released */
                 up(&dev->sem);
                 idmouse_delete(dev);
-                up(&disconnect_sem);
+                mutex_unlock(&disconnect_mutex);
                 return 0;
         }
 
         up(&dev->sem);
-        up(&disconnect_sem);
+        mutex_unlock(&disconnect_mutex);
         return 0;
 }
 
@@ -340,10 +341,9 @@ static int idmouse_probe(struct usb_interface *interface,
                 return -ENODEV;
 
         /* allocate memory for our device state and initialize it */
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (dev == NULL)
                 return -ENOMEM;
-        memset(dev, 0x00, sizeof(*dev));
 
         init_MUTEX(&dev->sem);
         dev->udev = udev;
@@ -400,7 +400,7 @@ static void idmouse_disconnect(struct usb_interface *interface)
         struct usb_idmouse *dev;
 
         /* prevent races with open() */
-        down(&disconnect_sem);
+        mutex_lock(&disconnect_mutex);
 
         /* get device structure */
         dev = usb_get_intfdata(interface);
@@ -422,7 +422,7 @@ static void idmouse_disconnect(struct usb_interface *interface)
         if (!dev->open)
                 idmouse_delete(dev);
 
-        up(&disconnect_sem);
+        mutex_unlock(&disconnect_mutex);
 
         info("%s disconnected", DRIVER_DESC);
 }