diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-02-16 05:17:57 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-16 06:34:04 +0100 |
| commit | d147da73c9a3f617e4685c6a7762961fe19833e7 (patch) | |
| tree | 59e030b7af5d6e2c38f85dbd3d18913f77bfdf46 | |
| parent | ACPI: thinkpad-acpi: improve thinkpad-acpi input device documentation (diff) | |
| download | linux-d147da73c9a3f617e4685c6a7762961fe19833e7.tar.xz linux-d147da73c9a3f617e4685c6a7762961fe19833e7.zip | |
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.txt | 2 | ||||
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 8 |
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: 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/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) { 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) |