aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPing Cheng <pingc@wacom.com>2010-04-13 23:07:52 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-04-15 11:16:10 -0700
commit014f61504af276ba9d9544d8a7401d8f8526eb73 (patch)
treea3d386045a91d9cd1f446637c2901bd2a16634c4 /drivers
parentafb567e3fdd2ee43b243cb4f6fe772ab921b2ada (diff)
downloadmrst-s0i3-test-014f61504af276ba9d9544d8a7401d8f8526eb73.tar.gz
mrst-s0i3-test-014f61504af276ba9d9544d8a7401d8f8526eb73.tar.xz
mrst-s0i3-test-014f61504af276ba9d9544d8a7401d8f8526eb73.zip
Input: wacom - switch mode upon system resume
When Wacom devices wake up from a sleep, the switch mode command (wacom_query_tablet_data) is needed before wacom_open is called. wacom_query_tablet_data should not be executed inside wacom_open since wacom_open is called more than once during probe. wacom_retrieve_hid_descriptor is removed from wacom_resume due to the fact that the required descriptors are stored properly upon system resume. Reported-and-tested-by: Anton Anikin <Anton@Anikin.name> Signed-off-by: Ping Cheng <pingc@wacom.com> Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/tablet/wacom_sys.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 8b5d2873f0c..f46502589e4 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -673,13 +673,15 @@ static int wacom_resume(struct usb_interface *intf)
int rv;
mutex_lock(&wacom->lock);
- if (wacom->open) {
+
+ /* switch to wacom mode first */
+ wacom_query_tablet_data(intf, features);
+
+ if (wacom->open)
rv = usb_submit_urb(wacom->irq, GFP_NOIO);
- /* switch to wacom mode if needed */
- if (!wacom_retrieve_hid_descriptor(intf, features))
- wacom_query_tablet_data(intf, features);
- } else
+ else
rv = 0;
+
mutex_unlock(&wacom->lock);
return rv;