| commit | e90f869cae3b4aedf0f6d2ca8048d60245ee77f7 | [log] [tgz] |
|---|---|---|
| author | Dima Zavin <dima@android.com> | Fri Dec 30 15:16:44 2011 -0800 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Fri Dec 30 15:26:35 2011 -0800 |
| tree | 9afd751f1f9bdbd2623e065054aafc8cdfdb41eb | |
| parent | 566cf5b6e34504aaccb76167ecccd7e7e69e6456 [diff] [blame] |
Input: evdev - if no events and non-block, return EAGAIN not 0 Signed-off-by: Dima Zavin <dima@android.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 03344b3..a9d8716 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c
@@ -412,6 +412,9 @@ retval += input_event_size(); } + if (retval == 0 && (file->f_flags & O_NONBLOCK)) + return -EAGAIN; + return retval; }