thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Sun, 27 Sep 2009 00:42:49 +0000 (21:42 -0300)
committerLen Brown <len.brown@intel.com>
Sun, 27 Sep 2009 06:13:06 +0000 (02:13 -0400)
Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:

  CHECK   drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
  CC [M]  drivers/platform/x86/thinkpad_acpi.o
drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment

Reported-by: Noah Dain <noahdain@gmail.com>
Reported-by: Audrius Kazukauskas <audrius@neutrino.lt>
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/platform/x86/thinkpad_acpi.c

index 3910f2f..d93108d 100644 (file)
@@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask)
 
        HOTKEY_CONFIG_CRITICAL_START
        hotkey_driver_mask = mask;
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
        hotkey_source_mask |= (mask & ~hotkey_all_mask);
+#endif
        HOTKEY_CONFIG_CRITICAL_END
 
        rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) &