From 124b9d6d2421cbca59b8228e714d8fb01c95c6ab Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Sat, 12 Sep 2009 15:22:16 -0300 Subject: [PATCH] --- yaml --- r: 165179 b: refs/heads/master c: 20c9aa46f644b3ddb161a819d1b0c2b07097c4ee h: refs/heads/master i: 165177: 36e1407a6e4389eac158025bda305b9e951389f4 165175: b619b91e0f0cd848109e7a9083904fac9b662bd1 v: v3 --- [refs] | 2 +- trunk/Documentation/laptops/thinkpad-acpi.txt | 2 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62fa0c77abb5..a28e743addb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06777be6d8688ba93103fffbbe9e64a5e6fab3c8 +refs/heads/master: 20c9aa46f644b3ddb161a819d1b0c2b07097c4ee diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index ab4b58eaa7f4..6d03487ef1c7 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -219,7 +219,7 @@ The following commands can be written to the /proc/acpi/ibm/hotkey file: echo 0xffffffff > /proc/acpi/ibm/hotkey -- enable all hot keys echo 0 > /proc/acpi/ibm/hotkey -- disable all possible hot keys ... any other 8-hex-digit mask ... - echo reset > /proc/acpi/ibm/hotkey -- restore the original mask + echo reset > /proc/acpi/ibm/hotkey -- restore the recommended mask The following commands have been deprecated and will cause the kernel to log a warning: diff --git a/trunk/drivers/platform/x86/thinkpad_acpi.c b/trunk/drivers/platform/x86/thinkpad_acpi.c index 6b667891fc3b..dd779e54894f 100644 --- a/trunk/drivers/platform/x86/thinkpad_acpi.c +++ b/trunk/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) {