public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes
@ 2016-06-14 11:20 Martin Kepplinger
  2016-06-14 11:37 ` Oliver Neukum
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Martin Kepplinger @ 2016-06-14 11:20 UTC (permalink / raw)
  To: dmitry.torokhov
  Cc: linux-kernel, linux-input, kernel-testers, linux-usb,
	Martin Kepplinger

 * 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(-)

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);
 }
 
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-07-09 12:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-14 11:20 [PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes Martin Kepplinger
2016-06-14 11:37 ` Oliver Neukum
2016-06-15 13:01 ` [PATCH v9] input: tablet: add Pegasus Notetaker tablet driver Martin Kepplinger
2016-06-23 15:50   ` Martin Kepplinger
2016-06-23 17:18 ` [PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes Dmitry Torokhov
2016-06-28 16:17   ` Martin Kepplinger
2016-07-08 21:08     ` Dmitry Torokhov
2016-07-09 12:07       ` Martin Kepplinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox