Merge branch 'upstream-fixes' into for-linus

Conflicts:
	drivers/hid/hid-wacom.c

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index c79578b5a788..6d65d4e35120 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -272,8 +272,10 @@ static int hidraw_open(struct inode *inode, struct file *file)
         dev = hidraw_table[minor];
         if (!dev->open++) {
                 err = hid_hw_power(dev->hid, PM_HINT_FULLON);
-                if (err < 0)
+                if (err < 0) {
+                        dev->open--;
                         goto out_unlock;
+                }
 
                 err = hid_hw_open(dev->hid);
                 if (err < 0) {
@@ -510,13 +512,12 @@ void hidraw_disconnect(struct hid_device *hid)
 {
         struct hidraw *hidraw = hid->hidraw;
 
+        mutex_lock(&minors_lock);
         hidraw->exist = 0;
 
         device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor));
 
-        mutex_lock(&minors_lock);
         hidraw_table[hidraw->minor] = NULL;
-        mutex_unlock(&minors_lock);
 
         if (hidraw->open) {
                 hid_hw_close(hid);
@@ -524,6 +525,7 @@ void hidraw_disconnect(struct hid_device *hid)
         } else {
                 kfree(hidraw);
         }
+        mutex_unlock(&minors_lock);
 }
 EXPORT_SYMBOL_GPL(hidraw_disconnect);