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

Groups > linux.kernel > #1420847 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  [PATCH] input: tablet: pegasus_notetaker: USB PM fixes Martin Kepplinger <martink@posteo.de> - 2016-06-13 15:40 +0200
    Re: [PATCH] input: tablet: pegasus_notetaker: USB PM fixes Oliver Neukum <oneukum@suse.com> - 2016-06-13 16:20 +0200

#1420847 — [PATCH] input: tablet: pegasus_notetaker: USB PM fixes

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

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

[toc] | [next] | [standalone]

#1420910

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web