diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 15:14:53 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 15:14:53 +0200 |
commit | 621de593081524da2f0f7b060f5951b4155eb4a2 (patch) | |
tree | dcb1777094498496a3036b0e49546887e72d6a06 /drivers/hid/hidraw.c | |
parent | afa5eb7c68689ced4284f01c96feed44a2d0a127 (diff) | |
parent | 6d77976800c3f29a0337fadcc9ddd79050fa5620 (diff) |
Merge branch 'autosuspend' into for-next
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r-- | drivers/hid/hidraw.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 02b19db5442..e263d473117 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); |