From: Martin Kepplinger <martink@posteo.de>
To: dmitry.torokhov@gmail.com
Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
Martin Kepplinger <martink@posteo.de>
Subject: [PATCH 2/4] input: tablet: pegasus_notetaker: Fix usb_autopm calls to be balanced
Date: Mon, 18 Jul 2016 16:29:07 +0200 [thread overview]
Message-ID: <1468852149-2614-3-git-send-email-martink@posteo.de> (raw)
In-Reply-To: <1468852149-2614-1-git-send-email-martink@posteo.de>
Signed-off-by: Martin Kepplinger <martink@posteo.de>
---
drivers/input/tablet/pegasus_notetaker.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
index 27cb352..fdbc5e8 100644
--- a/drivers/input/tablet/pegasus_notetaker.c
+++ b/drivers/input/tablet/pegasus_notetaker.c
@@ -208,27 +208,30 @@ static int pegasus_open(struct input_dev *dev)
return retval;
pegasus->irq->dev = pegasus->usbdev;
- if (usb_submit_urb(pegasus->irq, GFP_KERNEL))
+ if (usb_submit_urb(pegasus->irq, GFP_KERNEL)) {
retval = -EIO;
+ goto out;
+ }
retval = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);
- usb_autopm_put_interface(pegasus->intf);
+out:
- return retval;
+ if (retval < 0) {
+ usb_autopm_put_interface(pegasus->intf);
+ return retval;
+ } else {
+ return 0;
+ }
}
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,
--
2.1.4
next prev parent reply other threads:[~2016-07-18 14:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1468852149-2614-1-git-send-email-martink@posteo.de>
2016-07-18 14:29 ` [PATCH 1/4] input: tablet: pegasus_notetaker: Track usb control msg errors Martin Kepplinger
2016-07-20 21:06 ` Dmitry Torokhov
2016-07-21 11:06 ` Martin Kepplinger
2016-07-18 14:29 ` Martin Kepplinger [this message]
2016-07-20 21:29 ` [PATCH 2/4] input: tablet: pegasus_notetaker: Fix usb_autopm calls to be balanced Dmitry Torokhov
2016-07-21 11:00 ` Martin Kepplinger
2016-07-18 14:29 ` [PATCH 3/4] input: tablet: pegasus_notetaker: Cancel workqueue's work in suspend() Martin Kepplinger
2016-07-20 21:30 ` Dmitry Torokhov
2016-07-18 14:29 ` [PATCH 4/4] input: tablet: pegasus_notetaker: Set device mode in reset_resume() if in use Martin Kepplinger
2016-07-20 21:30 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468852149-2614-3-git-send-email-martink@posteo.de \
--to=martink@posteo.de \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®