From: Peter Mamonov <pmamonov@gmail.com>
To: barebox@lists.infradead.org
Cc: Peter Mamonov <pmamonov@gmail.com>
Subject: [PATCH 1/2] input: usb_kbd: skip poll on -EAGAIN error
Date: Wed, 14 Oct 2015 13:15:48 +0300 [thread overview]
Message-ID: <1444817749-20766-2-git-send-email-pmamonov@gmail.com> (raw)
In-Reply-To: <1444817749-20766-1-git-send-email-pmamonov@gmail.com>
Skip poll if either usb_submit_int_msg() or usb_get_report()
returned -EAGAIN.
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
---
drivers/input/usb_kbd.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/input/usb_kbd.c b/drivers/input/usb_kbd.c
index 8c08aba..655d0c7 100644
--- a/drivers/input/usb_kbd.c
+++ b/drivers/input/usb_kbd.c
@@ -274,7 +274,7 @@ static void usb_kbd_poll(struct poller_struct *poller)
struct usb_kbd_pdata *data = container_of(poller,
struct usb_kbd_pdata, poller);
struct usb_device *usbdev = data->usbdev;
- int diff, tout;
+ int diff, tout, ret;
if (data->lock)
return;
@@ -284,7 +284,10 @@ static void usb_kbd_poll(struct poller_struct *poller)
goto exit;
data->last_poll = get_time_ns();
- if (0 > data->do_poll(data)) {
+ ret = data->do_poll(data);
+ if (ret == -EAGAIN)
+ goto exit;
+ if (ret < 0) {
/* exit and lock forever */
dev_err(&usbdev->dev,
"usb_submit_int_msg() failed. Keyboard disconnect?\n");
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-10-14 10:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-14 10:15 [PATCH 0/2] usb: core: return -EAGAIN on usb_* functions reentrance Peter Mamonov
2015-10-14 10:15 ` Peter Mamonov [this message]
2015-10-14 10:15 ` [PATCH 2/2] " Peter Mamonov
2015-10-14 14:09 ` [PATCH 0/2] " Sascha Hauer
2015-10-15 12:38 ` Peter Mamonov
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=1444817749-20766-2-git-send-email-pmamonov@gmail.com \
--to=pmamonov@gmail.com \
--cc=barebox@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.