Commit 4b200b46 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Darren Hart

ideapad: fix software rfkill setting

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)")
Cc: stable@vger.kernel.org # v2.6.38+
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
parent f8358578
...@@ -464,8 +464,9 @@ static const struct ideapad_rfk_data ideapad_rfk_data[] = { ...@@ -464,8 +464,9 @@ static const struct ideapad_rfk_data ideapad_rfk_data[] = {
static int ideapad_rfk_set(void *data, bool blocked) static int ideapad_rfk_set(void *data, bool blocked)
{ {
struct ideapad_rfk_priv *priv = data; struct ideapad_rfk_priv *priv = data;
int opcode = ideapad_rfk_data[priv->dev].opcode;
return write_ec_cmd(priv->priv->adev->handle, priv->dev, !blocked); return write_ec_cmd(priv->priv->adev->handle, opcode, !blocked);
} }
static struct rfkill_ops ideapad_rfk_ops = { static struct rfkill_ops ideapad_rfk_ops = {
......
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