aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2009-09-20 14:09:23 -0300
committerLen Brown <len.brown@intel.com>2009-09-20 13:44:25 -0400
commit4be73005e4dcf111fa88f7265ed147e2de38b075 (patch)
treed0840ac623f77052e7bfea025ff4f8298acf4eb3 /drivers/platform/x86
parent435c47e20bc212d0fa6652ac93fae8eaee7b9b34 (diff)
downloadmrst-s0i3-test-4be73005e4dcf111fa88f7265ed147e2de38b075.tar.gz
mrst-s0i3-test-4be73005e4dcf111fa88f7265ed147e2de38b075.tar.xz
mrst-s0i3-test-4be73005e4dcf111fa88f7265ed147e2de38b075.zip
thinkpad-acpi: remove uneeded tp_features.hotkey tests in hotkey_exit
hotkey_exit() is only called if hotkey_init() finished sucessfully, or by direct calls inside hotkey_init(). The tp_features.hotkey test is always true, and just adds to the confusion, remove it. Also, avoid calling hotkey_mask_set() when it won't do anything useful. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index b789ee8bc14..1b4d6f686bf 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2843,16 +2843,14 @@ static void hotkey_exit(void)
kfree(hotkey_keycode_map);
- if (tp_features.hotkey) {
- dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY,
- "restoring original hot key mask\n");
- /* no short-circuit boolean operator below! */
- if ((hotkey_mask_set(hotkey_orig_mask) |
- hotkey_status_set(false)) != 0)
- printk(TPACPI_ERR
- "failed to restore hot key mask "
- "to BIOS defaults\n");
- }
+ dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY,
+ "restoring original hot key mask\n");
+ /* no short-circuit boolean operator below! */
+ if (((tp_features.hotkey_mask && hotkey_mask_set(hotkey_orig_mask))
+ | hotkey_status_set(false)) != 0)
+ printk(TPACPI_ERR
+ "failed to restore hot key mask "
+ "to BIOS defaults\n");
}
static void __init hotkey_unmap(const unsigned int scancode)