diff options
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 3910f2f3eada..d93108d148fc 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
| @@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask) | |||
| 2235 | 2235 | ||
| 2236 | HOTKEY_CONFIG_CRITICAL_START | 2236 | HOTKEY_CONFIG_CRITICAL_START |
| 2237 | hotkey_driver_mask = mask; | 2237 | hotkey_driver_mask = mask; |
| 2238 | #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL | ||
| 2238 | hotkey_source_mask |= (mask & ~hotkey_all_mask); | 2239 | hotkey_source_mask |= (mask & ~hotkey_all_mask); |
| 2240 | #endif | ||
| 2239 | HOTKEY_CONFIG_CRITICAL_END | 2241 | HOTKEY_CONFIG_CRITICAL_END |
| 2240 | 2242 | ||
| 2241 | rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) & | 2243 | rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) & |