Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1421797

[PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes

Show all headers | View raw

 * 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes Martin Kepplinger <martink@posteo.de> - 2016-06-14 13:30 +0200
  Re: [PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes Oliver Neukum <oneukum@suse.com> - 2016-06-14 13:50 +0200
  [PATCH v9] input: tablet: add Pegasus Notetaker tablet driver Martin Kepplinger <martink@posteo.de> - 2016-06-15 15:10 +0200
    Re: [PATCH v9] input: tablet: add Pegasus Notetaker tablet driver Martin Kepplinger <martink@posteo.de> - 2016-06-23 18:00 +0200
  Re: [PATCH v2] input: tablet: pegasus_notetaker: USB PM fixes Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-06-23 19:20 +0200

csiph-web