diff options
| author | Matthew Garrett <matthew.garrett@nebula.com> | 2013-08-18 13:23:31 -0400 |
|---|---|---|
| committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-08-18 13:23:31 -0400 |
| commit | 41c8bd1c75ef8e8566eca6b1c7bc273bc282f495 (patch) | |
| tree | a47c9b1d84ca5f63ec9cc5470c4329bc43e83759 /drivers | |
| parent | 0b8cb621fb26404c62486c91fa54d13e47fe68fa (diff) | |
| download | linux-41c8bd1c75ef8e8566eca6b1c7bc273bc282f495.tar.gz linux-41c8bd1c75ef8e8566eca6b1c7bc273bc282f495.tar.bz2 linux-41c8bd1c75ef8e8566eca6b1c7bc273bc282f495.zip | |
Revert "hp-wmi: Enable hotkeys on some systems"
This reverts commit b253c9d1d858a3f115f791ee4fe2b9399ae7dbbd. It's still
causing problems on some systems.
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 97bb05edcb5a..d6970f47ae72 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -53,7 +53,6 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); #define HPWMI_ALS_QUERY 0x3 #define HPWMI_HARDWARE_QUERY 0x4 #define HPWMI_WIRELESS_QUERY 0x5 -#define HPWMI_BIOS_QUERY 0x9 #define HPWMI_HOTKEY_QUERY 0xc #define HPWMI_WIRELESS2_QUERY 0x1b #define HPWMI_POSTCODEERROR_QUERY 0x2a @@ -293,19 +292,6 @@ static int hp_wmi_tablet_state(void) return (state & 0x4) ? 1 : 0; } -static int hp_wmi_enable_hotkeys(void) -{ - int ret; - int query = 0x6e; - - ret = hp_wmi_perform_query(HPWMI_BIOS_QUERY, 1, &query, sizeof(query), - 0); - - if (ret) - return -EINVAL; - return 0; -} - static int hp_wmi_set_block(void *data, bool blocked) { enum hp_wmi_radio r = (enum hp_wmi_radio) data; @@ -1009,8 +995,6 @@ static int __init hp_wmi_init(void) err = hp_wmi_input_setup(); if (err) return err; - - hp_wmi_enable_hotkeys(); } if (bios_capable) { |