diff options
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index b789ee8bc14e..1b4d6f686bf0 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -2843,16 +2843,14 @@ static void hotkey_exit(void) | |||
2843 | 2843 | ||
2844 | kfree(hotkey_keycode_map); | 2844 | kfree(hotkey_keycode_map); |
2845 | 2845 | ||
2846 | if (tp_features.hotkey) { | 2846 | dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY, |
2847 | dbg_printk(TPACPI_DBG_EXIT | TPACPI_DBG_HKEY, | 2847 | "restoring original hot key mask\n"); |
2848 | "restoring original hot key mask\n"); | 2848 | /* no short-circuit boolean operator below! */ |
2849 | /* no short-circuit boolean operator below! */ | 2849 | if (((tp_features.hotkey_mask && hotkey_mask_set(hotkey_orig_mask)) |
2850 | if ((hotkey_mask_set(hotkey_orig_mask) | | 2850 | | hotkey_status_set(false)) != 0) |
2851 | hotkey_status_set(false)) != 0) | 2851 | printk(TPACPI_ERR |
2852 | printk(TPACPI_ERR | 2852 | "failed to restore hot key mask " |
2853 | "failed to restore hot key mask " | 2853 | "to BIOS defaults\n"); |
2854 | "to BIOS defaults\n"); | ||
2855 | } | ||
2856 | } | 2854 | } |
2857 | 2855 | ||
2858 | static void __init hotkey_unmap(const unsigned int scancode) | 2856 | static void __init hotkey_unmap(const unsigned int scancode) |