| From 5451a923bbdcff6ae665947e120af7238b21a9d2 Mon Sep 17 00:00:00 2001 |
| From: Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
| Date: Tue, 15 Dec 2009 21:51:07 -0200 |
| Subject: thinkpad-acpi: log initial state of rfkill switches |
| |
| From: Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
| |
| commit 5451a923bbdcff6ae665947e120af7238b21a9d2 upstream. |
| |
| We already log the initial state of the hardware rfkill switch (WLSW), |
| might as well log the state of the softswitches as well. |
| |
| Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
| Cc: Josip Rodin <joy+kernel@entuzijast.net> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/platform/x86/thinkpad_acpi.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/platform/x86/thinkpad_acpi.c |
| +++ b/drivers/platform/x86/thinkpad_acpi.c |
| @@ -1264,6 +1264,7 @@ static int __init tpacpi_new_rfkill(cons |
| struct tpacpi_rfk *atp_rfk; |
| int res; |
| bool sw_state = false; |
| + bool hw_state; |
| int sw_status; |
| |
| BUG_ON(id >= TPACPI_RFK_SW_MAX || tpacpi_rfkill_switches[id]); |
| @@ -1298,7 +1299,8 @@ static int __init tpacpi_new_rfkill(cons |
| rfkill_init_sw_state(atp_rfk->rfkill, sw_state); |
| } |
| } |
| - rfkill_set_hw_state(atp_rfk->rfkill, tpacpi_rfk_check_hwblock_state()); |
| + hw_state = tpacpi_rfk_check_hwblock_state(); |
| + rfkill_set_hw_state(atp_rfk->rfkill, hw_state); |
| |
| res = rfkill_register(atp_rfk->rfkill); |
| if (res < 0) { |
| @@ -1311,6 +1313,9 @@ static int __init tpacpi_new_rfkill(cons |
| } |
| |
| tpacpi_rfkill_switches[id] = atp_rfk; |
| + |
| + printk(TPACPI_INFO "rfkill switch %s: radio is %sblocked\n", |
| + name, (sw_state || hw_state) ? "" : "un"); |
| return 0; |
| } |
| |
