diff options
author | Ping Cheng <pingc@wacom.com> | 2009-12-15 03:35:24 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-15 03:35:55 -0500 |
commit | 232f5693e5c9483e222528ef81979e42ea2f2908 (patch) | |
tree | 16728d937f3cd0a124b28a6da22a673ecc9661f1 /drivers/input/tablet/wacom_sys.c | |
parent | e47c4f70ea41fd973eec80a9388a1347d3d27896 (diff) |
Input: wacom - ensure the device is initialized properly upon resume
Call wacom_query_tablet_data() from wacom_resume() so the device will be
switched to Wacom mode upon resume. Devices that require this are: regular
tablets and two finger touch devices.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index ea30c983a33e..b5b69cc0aaf0 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/input/tablet/wacom_sys.c | 2 | * drivers/input/tablet/wacom_sys.c |
3 | * | 3 | * |
4 | * USB Wacom Graphire and Wacom Intuos tablet support - system specific code | 4 | * USB Wacom tablet support - system specific code |
5 | */ | 5 | */ |
6 | 6 | ||
7 | /* | 7 | /* |
@@ -562,9 +562,10 @@ static int wacom_resume(struct usb_interface *intf) | |||
562 | int rv; | 562 | int rv; |
563 | 563 | ||
564 | mutex_lock(&wacom->lock); | 564 | mutex_lock(&wacom->lock); |
565 | if (wacom->open) | 565 | if (wacom->open) { |
566 | rv = usb_submit_urb(wacom->irq, GFP_NOIO); | 566 | rv = usb_submit_urb(wacom->irq, GFP_NOIO); |
567 | else | 567 | wacom_query_tablet_data(intf); |
568 | } else | ||
568 | rv = 0; | 569 | rv = 0; |
569 | mutex_unlock(&wacom->lock); | 570 | mutex_unlock(&wacom->lock); |
570 | 571 | ||