aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2008-02-15 23:17:57 -0500
committerLen Brown <len.brown@intel.com>2008-02-16 00:34:04 -0500
commitd147da73c9a3f617e4685c6a7762961fe19833e7 (patch)
tree59e030b7af5d6e2c38f85dbd3d18913f77bfdf46
parentd0788cfbae0eddf13d5f2591acb1b407ba041d71 (diff)
ACPI: thinkpad-acpi: minor hotkey_radio_sw fixes
Fixes some minor points in the radio switch code and docs. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--Documentation/laptops/thinkpad-acpi.txt2
-rw-r--r--drivers/misc/thinkpad_acpi.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 91f688c30185..606af1628382 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -306,7 +306,7 @@ sysfs notes:
306 The recommended polling frequency is 10Hz. 306 The recommended polling frequency is 10Hz.
307 307
308 hotkey_radio_sw: 308 hotkey_radio_sw:
309 if the ThinkPad has a hardware radio switch, this 309 If the ThinkPad has a hardware radio switch, this
310 attribute will read 0 if the switch is in the "radios 310 attribute will read 0 if the switch is in the "radios
311 disabled" position, and 1 if the switch is in the 311 disabled" position, and 1 if the switch is in the
312 "radios enabled" position. 312 "radios enabled" position.
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 35483502a117..c119cf23e1ff 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -1161,15 +1161,15 @@ static void tpacpi_input_send_radiosw(void)
1161{ 1161{
1162 int wlsw; 1162 int wlsw;
1163 1163
1164 mutex_lock(&tpacpi_inputdev_send_mutex);
1165
1166 if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) { 1164 if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) {
1165 mutex_lock(&tpacpi_inputdev_send_mutex);
1166
1167 input_report_switch(tpacpi_inputdev, 1167 input_report_switch(tpacpi_inputdev,
1168 SW_RADIO, !!wlsw); 1168 SW_RADIO, !!wlsw);
1169 input_sync(tpacpi_inputdev); 1169 input_sync(tpacpi_inputdev);
1170 }
1171 1170
1172 mutex_unlock(&tpacpi_inputdev_send_mutex); 1171 mutex_unlock(&tpacpi_inputdev_send_mutex);
1172 }
1173} 1173}
1174 1174
1175static void tpacpi_input_send_tabletsw(unsigned int state) 1175static void tpacpi_input_send_tabletsw(unsigned int state)