summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2009-09-12 15:22:16 -0300
committerLen Brown <len.brown@intel.com>2009-09-19 00:53:50 -0400
commit20c9aa46f644b3ddb161a819d1b0c2b07097c4ee (patch)
tree2932b70a41ba2c83a29c200ad1042fa5e765a374 /drivers/platform
parent06777be6d8688ba93103fffbbe9e64a5e6fab3c8 (diff)
downloadlinux-20c9aa46f644b3ddb161a819d1b0c2b07097c4ee.tar.gz
linux-20c9aa46f644b3ddb161a819d1b0c2b07097c4ee.tar.bz2
linux-20c9aa46f644b3ddb161a819d1b0c2b07097c4ee.zip
thinkpad-acpi: Fix procfs hotkey reset command
echo "reset" > /proc/acpi/ibm/hotkey should do something non-useless, so instead of setting it to Fn+F2, Fn+F3, Fn+F5, set it to hotkey_recommended_mask. It is not like it will survive for much longer, anyway. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 6b667891fc3b..dd779e54894f 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) {