summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-06-13 15:23:33 +0200
committerZefan Li <lizefan@huawei.com>2015-10-22 09:20:05 +0800
commit5e77bfbbf12d21ac303c802ce41a5f3fa3e1ff79 (patch)
treed6381f0cdbb66f2f2362f029f6013f0ee3c2ba86
parent2fe77cbcdb483b9ce541c0978fb485f31213ee23 (diff)
downloadlwn-5e77bfbbf12d21ac303c802ce41a5f3fa3e1ff79.tar.gz
lwn-5e77bfbbf12d21ac303c802ce41a5f3fa3e1ff79.zip
ideapad: fix software rfkill setting
commit 4b200b4604bec3388426159f1656109d19fadf6e upstream. This fixes a several year old regression that I found while trying to get the Yoga 3 11 to work. The ideapad_rfk_set function is meant to send a command to the embedded controller through ACPI, but as of c1f73658ed, it sends the index of the rfkill device instead of the command, and ignores the opcode field. This changes it back to the original behavior, which indeed flips the rfkill state as seen in the debugfs interface. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: c1f73658ed ("ideapad: pass ideapad_priv as argument (part 2)") Signed-off-by: Darren Hart <dvhart@linux.intel.com> [lizf: Backported to 3.4: @data is not a pointer but the device idx] Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r--drivers/platform/x86/ideapad-laptop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index ac902f7a9baa..34e9fcfc63d6 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -407,7 +407,8 @@ const struct ideapad_rfk_data ideapad_rfk_data[] = {
static int ideapad_rfk_set(void *data, bool blocked)
{
- unsigned long opcode = (unsigned long)data;
+ unsigned long dev = (unsigned long)data;
+ int opcode = ideapad_rfk_data[dev].opcode;
return write_ec_cmd(ideapad_handle, opcode, !blocked);
}