summaryrefslogtreecommitdiff
path: root/drivers/input/evdev.c
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-10-04 22:31:48 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:39:09 -0800
commitfc458f5194860f69b961deb0380e65b5006a2138 (patch)
tree263b00f3378505325576f67bf5ccb772aca2b1da /drivers/input/evdev.c
parent702e787706791a2edac206f30996bd5c32302e85 (diff)
input: evdev: if no events and non-block, return EAGAIN not 0
Change-Id: I5f0da721f74e5de111cffc7e7b375b72dd80e530 Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r--drivers/input/evdev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 13a741ae6045..10ae1c966a35 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -426,6 +426,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;
}