From 4d3197ca578df000097f1a8448e92e75c6480ca3 Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Sat, 16 Feb 2008 02:17:57 -0200 Subject: [PATCH] --- yaml --- r: 86125 b: refs/heads/master c: d147da73c9a3f617e4685c6a7762961fe19833e7 h: refs/heads/master i: 86123: 830284b71c5b091a72fa06c87d1d41006042f3b5 v: v3 --- [refs] | 2 +- trunk/Documentation/laptops/thinkpad-acpi.txt | 2 +- trunk/drivers/misc/thinkpad_acpi.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 88e832e15923..9e6774f725b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0788cfbae0eddf13d5f2591acb1b407ba041d71 +refs/heads/master: d147da73c9a3f617e4685c6a7762961fe19833e7 diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index 91f688c30185..606af1628382 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -306,7 +306,7 @@ sysfs notes: The recommended polling frequency is 10Hz. hotkey_radio_sw: - if the ThinkPad has a hardware radio switch, this + If the ThinkPad has a hardware radio switch, this attribute will read 0 if the switch is in the "radios disabled" position, and 1 if the switch is in the "radios enabled" position. diff --git a/trunk/drivers/misc/thinkpad_acpi.c b/trunk/drivers/misc/thinkpad_acpi.c index 35483502a117..c119cf23e1ff 100644 --- a/trunk/drivers/misc/thinkpad_acpi.c +++ b/trunk/drivers/misc/thinkpad_acpi.c @@ -1161,15 +1161,15 @@ static void tpacpi_input_send_radiosw(void) { int wlsw; - mutex_lock(&tpacpi_inputdev_send_mutex); - if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) { + mutex_lock(&tpacpi_inputdev_send_mutex); + input_report_switch(tpacpi_inputdev, SW_RADIO, !!wlsw); input_sync(tpacpi_inputdev); - } - mutex_unlock(&tpacpi_inputdev_send_mutex); + mutex_unlock(&tpacpi_inputdev_send_mutex); + } } static void tpacpi_input_send_tabletsw(unsigned int state)