From: Dima Zavin <dima@android.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Dima Zavin <dima@android.com>, Jeff Brown <jeffbrown@android.com>
Subject: [PATCH 2/3] input: evdev: if no events and non-block, return EAGAIN not 0
Date: Fri, 16 Dec 2011 10:07:05 -0800 [thread overview]
Message-ID: <1324058826-12891-2-git-send-email-dima@android.com> (raw)
In-Reply-To: <1324058826-12891-1-git-send-email-dima@android.com>
Cc: Jeff Brown <jeffbrown@android.com>
Signed-off-by: Dima Zavin <dima@android.com>
---
drivers/input/evdev.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 03344b3..2e563af 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -412,6 +412,8 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,
retval += input_event_size();
}
+ if (retval == 0 && file->f_flags & O_NONBLOCK)
+ retval = -EAGAIN;
return retval;
}
--
1.7.3.1
next prev parent reply other threads:[~2011-12-16 18:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-16 18:07 [PATCH 1/3] input: evdev: only allow reading events if a full packet is present Dima Zavin
2011-12-16 18:07 ` Dima Zavin [this message]
2011-12-16 18:07 ` [PATCH 3/3] input: evdev: do not block waiting for an event if fd is nonblock Dima Zavin
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=1324058826-12891-2-git-send-email-dima@android.com \
--to=dima@android.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jeffbrown@android.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
Powered by JetHome