msi-laptop: Set rfkill init state when msi-laptop intiial

Setup Wlan/Bluetooth/3G rfkill initial state to sync with the hardware
state from EC 0x2e address.

Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 45197d75db914116074ee2bca523c838fe6aeb76..34bec2e26843a90949abf87781bbb57b90ffe9e5 100644 (file)
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -581,11 +581,31 @@ static void rfkill_cleanup(void)
        }
 }
 
+static void msi_init_rfkill(struct work_struct *ignored)
+{
+       if (rfk_wlan) {
+               rfkill_set_sw_state(rfk_wlan, !wlan_s);
+               rfkill_wlan_set(NULL, !wlan_s);
+       }
+       if (rfk_bluetooth) {
+               rfkill_set_sw_state(rfk_bluetooth, !bluetooth_s);
+               rfkill_bluetooth_set(NULL, !bluetooth_s);
+       }
+       if (rfk_threeg) {
+               rfkill_set_sw_state(rfk_threeg, !threeg_s);
+               rfkill_threeg_set(NULL, !threeg_s);
+       }
+}
+static DECLARE_DELAYED_WORK(msi_rfkill_init, msi_init_rfkill);
+
 static int rfkill_init(struct platform_device *sdev)
 {
        /* add rfkill */
        int retval;
 
+       /* keep the hardware wireless state */
+       get_wireless_state_ec_standard();
+
        rfk_bluetooth = rfkill_alloc("msi-bluetooth", &sdev->dev,
                                RFKILL_TYPE_BLUETOOTH,
                                &rfkill_bluetooth_ops, NULL);
@@ -619,6 +639,10 @@ static int rfkill_init(struct platform_device *sdev)
                        goto err_threeg;
        }
 
+       /* schedule to run rfkill state initial */
+       schedule_delayed_work(&msi_rfkill_init,
+                               round_jiffies_relative(1 * HZ));
+
        return 0;
 
 err_threeg: