1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index a9d871651ce7..76457d50bc34 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -391,14 +391,13 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,
         if (count < input_event_size())
                 return -EINVAL;
 
-        if (client->packet_head == client->tail && evdev->exist &&
-            (file->f_flags & O_NONBLOCK))
-                return -EAGAIN;
-
-        retval = wait_event_interruptible(evdev->wait,
-                client->packet_head != client->tail || !evdev->exist);
-        if (retval)
-                return retval;
+        if (!(file->f_flags & O_NONBLOCK)) {
+                retval = wait_event_interruptible(evdev->wait,
+                                client->packet_head != client->tail ||
+                                !evdev->exist);
+                if (retval)
+                        return retval;
+        }
 
         if (!evdev->exist)
                 return -ENODEV;