Commit 5e77bfbb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Zefan Li

ideapad: fix software rfkill setting

commit 4b200b46 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 c1f73658, 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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: c1f73658 ("ideapad: pass ideapad_priv as argument (part 2)")
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
[lizf: Backported to 3.4: @data is not a pointer but the device idx]
Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
parent 2fe77cbc
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment