From 6aa0b1adb4da5c3e51f6be105672e26a2a1e5b3e Mon Sep 17 00:00:00 2001
From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Date: Sun, 20 Sep 2009 14:09:23 -0300
Subject: [PATCH] --- yaml --- r: 166399 b: refs/heads/master c:
 4be73005e4dcf111fa88f7265ed147e2de38b075 h: refs/heads/master i:   166397:
 b7d8870fccdcce78f751a1cf665b8de537b9ed84   166395:
 df74d9b9008d1cb821b553bfaf431180a924f075   166391:
 33f4954ec537be4dd64e5c20bb51b6397b1f4423   166383:
 d6cffc81923a32d07d9deffa15229f06ff5b02dd   166367:
 0f72d85bcdd673e7e06e3e0cf161a4d8692c6b33   166335:
 4323e55f6fc4ea1e49fb0a8905a0b2f5fee99875   166271:
 06fccff4f8ca60597efc65a14cc32a1b65d29a85   166143:
 e264567707b1d299393fe4ea521ce2a6c5d692d1   165887:
 0599574260c130641aaf6115c77cf9fe98747b42 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/platform/x86/thinkpad_acpi.c | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 121955ab471e..c1ff4ab50de1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 435c47e20bc212d0fa6652ac93fae8eaee7b9b34
+refs/heads/master: 4be73005e4dcf111fa88f7265ed147e2de38b075
diff --git a/trunk/drivers/platform/x86/thinkpad_acpi.c b/trunk/drivers/platform/x86/thinkpad_acpi.c
index b789ee8bc14e..1b4d6f686bf0 100644
--- a/trunk/drivers/platform/x86/thinkpad_acpi.c
+++ b/trunk/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)