diff options
| author | Ping Cheng | 2009-12-15 09:35:24 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2009-12-15 09:35:55 +0100 |
| commit | 232f5693e5c9483e222528ef81979e42ea2f2908 (patch) | |
| tree | 16728d937f3cd0a124b28a6da22a673ecc9661f1 /drivers/input/tablet/wacom_sys.c | |
| parent | Input: at32psif - do not sleep in atomic context (diff) | |
| download | kernel-qcow2-linux-232f5693e5c9483e222528ef81979e42ea2f2908.tar.gz kernel-qcow2-linux-232f5693e5c9483e222528ef81979e42ea2f2908.tar.xz kernel-qcow2-linux-232f5693e5c9483e222528ef81979e42ea2f2908.zip | |
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 @@ /* * drivers/input/tablet/wacom_sys.c * - * USB Wacom Graphire and Wacom Intuos tablet support - system specific code + * USB Wacom tablet support - system specific code */ /* @@ -562,9 +562,10 @@ static int wacom_resume(struct usb_interface *intf) int rv; mutex_lock(&wacom->lock); - if (wacom->open) + if (wacom->open) { rv = usb_submit_urb(wacom->irq, GFP_NOIO); - else + wacom_query_tablet_data(intf); + } else rv = 0; mutex_unlock(&wacom->lock); |