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 4/4] input: tablet: pegasus_notetaker: Set device mode in reset_resume() if in use
Date: Mon, 18 Jul 2016 16:29:09 +0200 [thread overview]
Message-ID: <1468852149-2614-5-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 | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
index 07436c6..b172247 100644
--- a/drivers/input/tablet/pegasus_notetaker.c
+++ b/drivers/input/tablet/pegasus_notetaker.c
@@ -398,7 +398,19 @@ static int pegasus_resume(struct usb_interface *intf)
static int pegasus_reset_resume(struct usb_interface *intf)
{
- return pegasus_resume(intf);
+ struct pegasus *pegasus = usb_get_intfdata(intf);
+ int retval = 0;
+
+ mutex_lock(&pegasus->dev->mutex);
+ if (pegasus->dev->users) {
+ retval = pegasus_set_mode(pegasus, PEN_MODE_XY,
+ NOTETAKER_LED_MOUSE);
+ if (!retval && usb_submit_urb(pegasus->irq, GFP_NOIO) < 0)
+ retval = -EIO;
+ }
+ mutex_unlock(&pegasus->dev->mutex);
+
+ return retval;
}
static const struct usb_device_id pegasus_ids[] = {
--
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 ` [PATCH 2/4] input: tablet: pegasus_notetaker: Fix usb_autopm calls to be balanced Martin Kepplinger
2016-07-20 21:29 ` 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 ` Martin Kepplinger [this message]
2016-07-20 21:30 ` [PATCH 4/4] input: tablet: pegasus_notetaker: Set device mode in reset_resume() if in use 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-5-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®