Re: patch input-wacom-switch-mode-upon-system-resume.patch added to 2.6.33-stable tree

Stefan Bader
2010-04-20T23:12:19Z

[-- Attachment #1: Type: text/plain, Size: 901 bytes --]

Greg KH wrote:
> On Mon, Apr 19, 2010 at 10:24:41AM -0700, Dmitry Torokhov wrote:
>> Greg,
>>
>> On Monday 19 April 2010 10:10:23 am gregkh@suse.de wrote:
>>> This is a note to let you know that we have just queued up the patch titled
>>>
>>> Subject: Input: wacom - switch mode upon system resume
>>>
>>> to the 2.6.33-stable tree. Its filename is
>>>
>>> input-wacom-switch-mode-upon-system-resume.patch
>>>
>> Could you add this to .32 as well, please?
>
> I looked, and it didn't seem to apply at all. Can someone backport it
> to .32 and I will be glad to apply it.
>

That would be my backport for .32, maybe Ping or Dmitry can sanity check.

Stefan

> thanks,
>
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe stable-commits" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: 0001-Input-wacom-switch-mode-upon-system-resume.patch --]
[-- Type: text/x-diff, Size: 1590 bytes --]

>From 7021bbc3685fc147eb47deee345801ffb007a7e9 Mon Sep 17 00:00:00 2001
From: Ping Cheng <pingc@wacom.com>
Date: Tue, 13 Apr 2010 23:07:52 -0700
Subject: [PATCH] Input: wacom - switch mode upon system resume

commit 014f61504af276ba9d9544d8a7401d8f8526eb73 upstream

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>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
drivers/input/tablet/wacom_sys.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index b5b69cc..5be07f9 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -562,11 +562,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);
- wacom_query_tablet_data(intf);
- } else
+ else
rv = 0;
+
mutex_unlock(&wacom->lock);

return rv;
--
1.6.3.3