From e90f869cae3b4aedf0f6d2ca8048d60245ee77f7 Mon Sep 17 00:00:00 2001
From: Dima Zavin <dima@android.com>
Date: Fri, 30 Dec 2011 15:16:44 -0800
Subject: 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>
---
 drivers/input/evdev.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'drivers/input/evdev.c')

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 03344b3c7c15..a9d871651ce7 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -412,6 +412,9 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,
 		retval += input_event_size();
 	}
 
+	if (retval == 0 && (file->f_flags & O_NONBLOCK))
+		return -EAGAIN;
+
 	return retval;
 }
 
-- 
cgit v1.2.3