X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fplatform%2Fx86%2Fthinkpad_acpi.c;h=dd779e54894f48881b26bab2919a3217ae956263;hb=20c9aa46f644b3ddb161a819d1b0c2b07097c4ee;hp=6b667891fc3b09161950d6d723fe71ace56ddacb;hpb=06777be6d8688ba93103fffbbe9e64a5e6fab3c8;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 6b66789..dd779e5 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3569,7 +3569,8 @@ static int hotkey_write(char *buf)
 			hotkey_enabledisable_warn(0);
 			res = -EPERM;
 		} else if (strlencmp(cmd, "reset") == 0) {
-			mask = hotkey_orig_mask;
+			mask = (hotkey_all_mask | hotkey_source_mask)
+				& ~hotkey_reserved_mask;
 		} else if (sscanf(cmd, "0x%x", &mask) == 1) {
 			/* mask set */
 		} else if (sscanf(cmd, "%x", &mask) == 1) {