From d691560e96b42a7cdc403b878b69ec8d023bb9d5 Mon Sep 17 00:00:00 2001
From: "Lee, Chun-Yi" <jlee@novell.com>
Date: Wed, 12 May 2010 09:58:09 -0700
Subject: [PATCH] --- yaml --- r: 197562 b: refs/heads/master c:
 3bb970214fce6495573843e4b7b786f8ea94cd70 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/platform/x86/msi-laptop.c | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 76d9e98b1631..d7d7e9851fb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f27e17bfa2ad34a2dbb61cd097d9ecf506639df
+refs/heads/master: 3bb970214fce6495573843e4b7b786f8ea94cd70
diff --git a/trunk/drivers/platform/x86/msi-laptop.c b/trunk/drivers/platform/x86/msi-laptop.c
index 45197d75db91..34bec2e26843 100644
--- a/trunk/drivers/platform/x86/msi-laptop.c
+++ b/trunk/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: