Merge branch 'autosuspend' into for-next

Conflicts:

	drivers/hid/hid-core.c

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 93dcb7e29102..e9b436d2d944 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -246,10 +246,12 @@ static int hiddev_release(struct inode * inode, struct file * file)
         spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
 
         if (!--list->hiddev->open) {
-                if (list->hiddev->exist)
+                if (list->hiddev->exist) {
                         usbhid_close(list->hiddev->hid);
-                else
+                        usbhid_put_power(list->hiddev->hid);
+                } else {
                         kfree(list->hiddev);
+                }
         }
 
         kfree(list);
@@ -300,6 +302,17 @@ static int hiddev_open(struct inode *inode, struct file *file)
         list_add_tail(&list->node, &hiddev_table[i]->list);
         spin_unlock_irq(&list->hiddev->list_lock);
 
+        if (!list->hiddev->open++)
+                if (list->hiddev->exist) {
+                        struct hid_device *hid = hiddev_table[i]->hid;
+                        res = usbhid_get_power(hid);
+                        if (res < 0) {
+                                res = -EIO;
+                                goto bail;
+                        }
+                        usbhid_open(hid);
+                }
+
         return 0;
 bail:
         file->private_data = NULL;