[v2] input: tablet: pegasus_notetaker: USB PM fixes
diff mbox

Message ID 1465903215-2351-1-git-send-email-martink@posteo.de
State Under Review
Headers show

Commit Message

Martin Kepplinger June 14, 2016, 11:20 a.m. UTC
* Fix usb_autopm calls to be balanced
 * In reset_resume() we need to set the device mode
 * In suspend() we must cancel the workqueue's work

Signed-off-by: Martin Kepplinger <martink@posteo.de>
---
Thanks Oliver, I think I got it now.

Dmitry, again, do you want to have a new version of the whole driver
instead of this?


 drivers/input/tablet/pegasus_notetaker.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Oliver Neukum June 14, 2016, 11:37 a.m. UTC | #1
On Tue, 2016-06-14 at 13:20 +0200, Martin Kepplinger wrote:
>  * Fix usb_autopm calls to be balanced
>  * In reset_resume() we need to set the device mode
>  * In suspend() we must cancel the workqueue's work
> 
> Signed-off-by: Martin Kepplinger <martink@posteo.de>

Looks good to me.

	Regards
		Oliver


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
index 83aa583..0c000d8 100644
--- a/drivers/input/tablet/pegasus_notetaker.c
+++ b/drivers/input/tablet/pegasus_notetaker.c
@@ -211,14 +211,9 @@  static int pegasus_open(struct input_dev *dev)
 static void pegasus_close(struct input_dev *dev)
 {
 	struct pegasus *pegasus = input_get_drvdata(dev);
-	int autopm_error;
 
-	autopm_error = usb_autopm_get_interface(pegasus->intf);
 	usb_kill_urb(pegasus->irq);
 	cancel_work_sync(&pegasus->init);
-
-	if (!autopm_error)
-		usb_autopm_put_interface(pegasus->intf);
 }
 
 static int pegasus_probe(struct usb_interface *intf,
@@ -364,6 +359,7 @@  static int pegasus_suspend(struct usb_interface *intf, pm_message_t message)
 
 	mutex_lock(&pegasus->dev->mutex);
 	usb_kill_urb(pegasus->irq);
+	cancel_work_sync(&pegasus->init);
 	mutex_unlock(&pegasus->dev->mutex);
 
 	return 0;
@@ -384,6 +380,11 @@  static int pegasus_resume(struct usb_interface *intf)
 
 static int pegasus_reset_resume(struct usb_interface *intf)
 {
+	struct pegasus *pegasus = usb_get_intfdata(intf);
+
+	if (pegasus->dev->users)
+		pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
+
 	return pegasus_resume(intf);
 }