Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

[firefly-linux-kernel-4.4.55.git] / net / rfkill / core.c

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 56b50e7db72d87618fd0193a1200ece4f61ae2ab..df2dae6b27236432c3f8a5ff2a4a7dbf5f8c1d2b 100644 (file)
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -149,20 +149,6 @@ static void rfkill_led_trigger_activate(struct led_classdev *led)
        rfkill_led_trigger_event(rfkill);
 }
 
-const char *rfkill_get_led_trigger_name(struct rfkill *rfkill)
-{
-       return rfkill->led_trigger.name;
-}
-EXPORT_SYMBOL(rfkill_get_led_trigger_name);
-
-void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name)
-{
-       BUG_ON(!rfkill);
-
-       rfkill->ledtrigname = name;
-}
-EXPORT_SYMBOL(rfkill_set_led_trigger_name);
-
 static int rfkill_led_trigger_register(struct rfkill *rfkill)
 {
        rfkill->led_trigger.name = rfkill->ledtrigname
@@ -1042,7 +1028,6 @@ static int rfkill_fop_open(struct inode *inode, struct file *file)
         * start getting events from elsewhere but hold mtx to get
         * startup events added first
         */
-       list_add(&data->list, &rfkill_fds);
 
        list_for_each_entry(rfkill, &rfkill_list, node) {
                ev = kzalloc(sizeof(*ev), GFP_KERNEL);
@@ -1051,6 +1036,7 @@ static int rfkill_fop_open(struct inode *inode, struct file *file)
                rfkill_fill_event(&ev->ev, rfkill, RFKILL_OP_ADD);
                list_add_tail(&ev->list, &data->events);
        }
+       list_add(&data->list, &rfkill_fds);
        mutex_unlock(&data->mtx);
        mutex_unlock(&rfkill_global_mutex);
 
@@ -1245,6 +1231,7 @@ static const struct file_operations rfkill_fops = {
        .unlocked_ioctl = rfkill_fop_ioctl,
        .compat_ioctl   = rfkill_fop_ioctl,
 #endif
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice rfkill_miscdev = {