diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-10 14:24:16 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-17 21:20:46 -0700 |
| commit | 62ecae09a01df507ef52e1bc90fc233a1978c60a (patch) | |
| tree | 0452f78a77dfb6a14c0cdda6e59f11b16b0f4317 | |
| parent | 3136baf8d09458bb04332b81494fd13ad90fe94a (diff) | |
| download | linux-3.10-62ecae09a01df507ef52e1bc90fc233a1978c60a.tar.gz linux-3.10-62ecae09a01df507ef52e1bc90fc233a1978c60a.tar.bz2 linux-3.10-62ecae09a01df507ef52e1bc90fc233a1978c60a.zip | |
Input: wacom - properly enable runtime PM
We need to always call usb_autopm_put_interface() in wacom_open(),
not only when initialization fails, otherwise the device will be
marked as PM-busy and will never be put in suspended state.
Based on patch by Oliver Neukum.
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 02de6535723..fc381498b79 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -120,14 +120,16 @@ static int wacom_open(struct input_dev *dev) out: mutex_unlock(&wacom->lock); - if (retval) - usb_autopm_put_interface(wacom->intf); + usb_autopm_put_interface(wacom->intf); return retval; } static void wacom_close(struct input_dev *dev) { struct wacom *wacom = input_get_drvdata(dev); + int autopm_error; + + autopm_error = usb_autopm_get_interface(wacom->intf); mutex_lock(&wacom->lock); usb_kill_urb(wacom->irq); @@ -135,7 +137,8 @@ static void wacom_close(struct input_dev *dev) wacom->intf->needs_remote_wakeup = 0; mutex_unlock(&wacom->lock); - usb_autopm_put_interface(wacom->intf); + if (!autopm_error) + usb_autopm_put_interface(wacom->intf); } static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc, |