1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 02b19db5442e..e263d4731179 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -181,9 +181,17 @@ static int hidraw_open(struct inode *inode, struct file *file)
 
         dev = hidraw_table[minor];
         if (!dev->open++) {
+                if (dev->hid->ll_driver->power) {
+                        err = dev->hid->ll_driver->power(dev->hid, PM_HINT_FULLON);
+                        if (err < 0)
+                                goto out_unlock;
+                }
                 err = dev->hid->ll_driver->open(dev->hid);
-                if (err < 0)
+                if (err < 0) {
+                        if (dev->hid->ll_driver->power)
+                                dev->hid->ll_driver->power(dev->hid, PM_HINT_NORMAL);
                         dev->open--;
+                }
         }
 
 out_unlock:
@@ -209,10 +217,13 @@ static int hidraw_release(struct inode * inode, struct file * file)
         list_del(&list->node);
         dev = hidraw_table[minor];
         if (!--dev->open) {
-                if (list->hidraw->exist)
+                if (list->hidraw->exist) {
+                        if (dev->hid->ll_driver->power)
+                                dev->hid->ll_driver->power(dev->hid, PM_HINT_NORMAL);
                         dev->hid->ll_driver->close(dev->hid);
-                else
+                } else {
                         kfree(list->hidraw);
+                }
         }
 
         kfree(list);