rfkill: fix rfkill_fop_read wait_event usage

[pandora-kernel.git] / net / rfkill / core.c

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 13d0fb6..ae7b50a 100644 (file)
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -1065,17 +1065,6 @@ static unsigned int rfkill_fop_poll(struct file *file, poll_table *wait)
        return res;
 }
 
        return res;
 }
 

-static bool rfkill_readable(struct rfkill_data *data)
-{
-       bool r;
-
-       mutex_lock(&data->mtx);
-       r = !list_empty(&data->events);
-       mutex_unlock(&data->mtx);
-
-       return r;
-}
-

 static ssize_t rfkill_fop_read(struct file *file, char __user *buf,
                               size_t count, loff_t *pos)
 {
 static ssize_t rfkill_fop_read(struct file *file, char __user *buf,
                               size_t count, loff_t *pos)
 {


@@ -1092,8 +1081,11 @@ static ssize_t rfkill_fop_read(struct file *file, char __user *buf,
                        goto out;
                }
                mutex_unlock(&data->mtx);
                        goto out;
                }
                mutex_unlock(&data->mtx);

+               /* since we re-check and it just compares pointers,
+                * using !list_empty() without locking isn't a problem
+                */

                ret = wait_event_interruptible(data->read_wait,
                ret = wait_event_interruptible(data->read_wait,

-                                              rfkill_readable(data));
+                                              !list_empty(&data->events));

                mutex_lock(&data->mtx);
 
                if (ret)
                mutex_lock(&data->mtx);
 
                if (ret)