1 files changed, 14 insertions, 20 deletions

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index af0a7c1002af..ff3c644888b1 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -242,6 +242,7 @@ static int hiddev_release(struct inode * inode, struct file * file)
         list_del(&list->node);
         spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
 
+        mutex_lock(&list->hiddev->existancelock);
         if (!--list->hiddev->open) {
                 if (list->hiddev->exist) {
                         usbhid_close(list->hiddev->hid);
@@ -252,6 +253,7 @@ static int hiddev_release(struct inode * inode, struct file * file)
         }
 
         kfree(list);
+        mutex_unlock(&list->hiddev->existancelock);
 
         return 0;
 }
@@ -300,17 +302,21 @@ static int hiddev_open(struct inode *inode, struct file *file)
         list_add_tail(&list->node, &hiddev->list);
         spin_unlock_irq(&list->hiddev->list_lock);
 
+        mutex_lock(&hiddev->existancelock);
         if (!list->hiddev->open++)
                 if (list->hiddev->exist) {
                         struct hid_device *hid = hiddev->hid;
                         res = usbhid_get_power(hid);
                         if (res < 0) {
                                 res = -EIO;
-                                goto bail;
+                                goto bail_unlock;
                         }
                         usbhid_open(hid);
                 }
+        mutex_unlock(&hiddev->existancelock);
         return 0;
+bail_unlock:
+        mutex_unlock(&hiddev->existancelock);
 bail:
         file->private_data = NULL;
         kfree(list);
@@ -367,8 +373,10 @@ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t coun
                                 /* let O_NONBLOCK tasks run */
                                 mutex_unlock(&list->thread_lock);
                                 schedule();
-                                if (mutex_lock_interruptible(&list->thread_lock))
+                                if (mutex_lock_interruptible(&list->thread_lock)) {
+                                        finish_wait(&list->hiddev->wait, &wait);
                                         return -EINTR;
+                                }
                                 set_current_state(TASK_INTERRUPTIBLE);
                         }
                         finish_wait(&list->hiddev->wait, &wait);
@@ -509,7 +517,7 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
                                  (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
                                   uref->usage_index + uref_multi->num_values > field->report_count))
                                 goto inval;
-                        }
+                }
 
                 switch (cmd) {
                 case HIDIOCGUSAGE:
@@ -801,14 +809,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         break;
 
                 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {
-                        int len;
-
-                        if (!hid->name) {
-                                r = 0;
-                                break;
-                        }
-
-                        len = strlen(hid->name) + 1;
+                        int len = strlen(hid->name) + 1;
                         if (len > _IOC_SIZE(cmd))
                                  len = _IOC_SIZE(cmd);
                         r = copy_to_user(user_arg, hid->name, len) ?
@@ -817,14 +818,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 }
 
                 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {
-                        int len;
-
-                        if (!hid->phys) {
-                                r = 0;
-                                break;
-                        }
-
-                        len = strlen(hid->phys) + 1;
+                        int len = strlen(hid->phys) + 1;
                         if (len > _IOC_SIZE(cmd))
                                 len = _IOC_SIZE(cmd);
                         r = copy_to_user(user_arg, hid->phys, len) ?
@@ -925,7 +919,6 @@ void hiddev_disconnect(struct hid_device *hid)
 
         mutex_lock(&hiddev->existancelock);
         hiddev->exist = 0;
-        mutex_unlock(&hiddev->existancelock);
 
         usb_deregister_dev(usbhid->intf, &hiddev_class);
 
@@ -935,4 +928,5 @@ void hiddev_disconnect(struct hid_device *hid)
         } else {
                 kfree(hiddev);
         }
+        mutex_unlock(&hiddev->existancelock);
 }