diff options
| author | Lee, Chun-Yi <jlee@novell.com> | 2010-05-12 09:58:09 -0700 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-05-20 09:30:20 -0400 |
| commit | 3bb970214fce6495573843e4b7b786f8ea94cd70 (patch) | |
| tree | 062c55b47cbd0c23a8930b5389ba3026986aab04 | |
| parent | 1f27e17bfa2ad34a2dbb61cd097d9ecf506639df (diff) | |
| download | linux-stable-3bb970214fce6495573843e4b7b786f8ea94cd70.tar.gz linux-stable-3bb970214fce6495573843e4b7b786f8ea94cd70.tar.bz2 linux-stable-3bb970214fce6495573843e4b7b786f8ea94cd70.zip | |
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>
| -rw-r--r-- | drivers/platform/x86/msi-laptop.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 45197d75db91..34bec2e26843 100644 --- 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: |