patch input-wacom-switch-mode-upon-system-resume.patch added to 2.6.33-stable tree
Quoted 8 lines · Greg KH
Quoted 7 lines · Dmitry Torokhov
Greg,
Quoted 4 lines · On Monday 19 April 2010 10:10:23 am [email protected] 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
Quoted 9 lines
Quoted 5 lines
Quoted 4 lines
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
Quoted 10 lines
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlFrom
7021bbc3685fc147eb47deee345801ffb007a7e9Mon Sep 17 00:00:00 2001
From: Ping Cheng <[email protected]>
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.
--- drivers/input/tablet/wacom_sys.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
drivers/input/tablet/wacom_sys.c +7 -3
@@ -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;
Signature · 1 line
1.6.3.3
Dmitry Torokhov
maintainerQuoted 13 lines · Stefan Bader
Quoted 12 lines · Greg KH
Quoted 11 lines · Dmitry Torokhov
Greg,
Quoted 8 lines · On Monday 19 April 2010 10:10:23 am [email protected] 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
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
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.
Yep, that exactly what Ping sent earlier, but since she favors wierd mailers with HTML I guess her patch was dropped by vger filters ;)
Thanks Stefan.
Greg, please apply.
Quoted 63 lines
Stefan
Quoted 7 lines
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlFrom
7021bbc3685fc147eb47deee345801ffb007a7e9Mon Sep 17 00:00:00 2001
From: Ping Cheng <[email protected]>
Date: Tue, 13 Apr 2010 23:07:52 -0700
Subject: [PATCH] Input: wacom - switch mode upon system resumecommit
014f61504af276ba9d9544d8a7401d8f8526eb73upstreamWhen Wacom devices wake up from a sleep, the switch mode command (
wacom_query_tablet_data) is needed beforewacom_openis called.wacom_query_tablet_datashould not be executed insidewacom_opensincewacom_openis called more than once during probe.
wacom_retrieve_hid_descriptoris removed fromwacom_resumedue to the fact that the required descriptors are stored properly upon system resume.Reported-and-tested-by Anton Anikin <[email protected]>Signed-off-by Ping Cheng <[email protected]>Signed-off-by Dmitry Torokhov <[email protected]>Signed-off-by Stefan Bader <[email protected]>--- drivers/input/tablet/wacom_sys.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)drivers/input/tablet/wacom_sys.c +7
-3@@ -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;Signature · 1 line
1.6.3.3
Signature · 1 line
Dmitry
Quoted 20 lines · Dmitry Torokhov
Quoted 19 lines · Stefan Bader
Quoted 17 lines · Greg KH
Quoted 5 lines · Dmitry Torokhov
Greg,
Quoted 2 lines · On Monday 19 April 2010 10:10:23 am [email protected] wrote:
This is a note to let you know that we have just queued up the patch titled
Quoted 7 lines
Quoted 6 lines
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.
Quoted 5 lines
Quoted 2 lines
That would be my backport for .32, maybe Ping or Dmitry can sanity check.
Yep, that exactly what Ping sent earlier, but since she favors wierd mailers with HTML I guess her patch was dropped by vger filters ;)
Yes, thanks, but I got Ping's email first, and I just applied her version.
thanks,
greg k-h