diff mbox

input: tablet: pegasus_notetaker: USB PM fixes

Message ID 1465824713-3156-1-git-send-email-martink@posteo.de (mailing list archive)
State New, archived
Headers show

Commit Message

Martin Kepplinger-Novakovic June 13, 2016, 1:31 p.m. UTC 
In close() we only need usb_autopm_put_interface(), in reset_resume()
we need to set the device mode, and in suspend(), we must cancel
the workqueue's work.

Signed-off-by: Martin Kepplinger <martink@posteo.de>
---
Thanks Oliver for these changes. For me, everything works as before.

Dmitry, do you want a new version of the whole thing instead of this
fix?

thanks
                          martin

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

Comments

Oliver Neukum June 13, 2016, 2:12 p.m. UTC | #1 
On Mon, 2016-06-13 at 15:31 +0200, Martin Kepplinger wrote:
> In close() we only need usb_autopm_put_interface(), in reset_resume()

Sorry, that is a misunderstanding. You need not carry
about power management in close() at all. But it must
be balanced of course.

	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
diff mbox

Patch

diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
index 83aa583..0c339e7 100644
--- a/drivers/input/tablet/pegasus_notetaker.c
+++ b/drivers/input/tablet/pegasus_notetaker.c
@@ -211,14 +211,11 @@  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);
+	usb_autopm_put_interface(pegasus->intf);
 }
 
 static int pegasus_probe(struct usb_interface *intf,
@@ -364,6 +361,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 +382,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);
 }