Merge branch 'fix/asoc' into for-linus

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 4cf25347b015..76457d50bc34 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -369,7 +369,7 @@ static int evdev_fetch_next_event(struct evdev_client *client,
 
         spin_lock_irq(&client->buffer_lock);
 
-        have_event = client->head != client->tail;
+        have_event = client->packet_head != client->tail;
         if (have_event) {
                 *event = client->buffer[client->tail++];
                 client->tail &= client->bufsize - 1;
@@ -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;
@@ -412,6 +411,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;
 }