diff --git a/[refs] b/[refs]
index 4c75cd1a9ad2..2bfa4ed71e62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 566cf5b6e34504aaccb76167ecccd7e7e69e6456
+refs/heads/master: e90f869cae3b4aedf0f6d2ca8048d60245ee77f7
diff --git a/trunk/drivers/input/evdev.c b/trunk/drivers/input/evdev.c
index 03344b3c7c15..a9d871651ce7 100644
--- a/trunk/drivers/input/evdev.c
+++ b/trunk/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;
 }