Skip to content

Commit

Permalink
ideapad: fix software rfkill setting
Browse files Browse the repository at this point in the history
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 c1f7365, 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: c1f7365 ("ideapad: pass ideapad_priv as argument (part 2)")
Cc: stable@vger.kernel.org # v2.6.38+
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
  • Loading branch information
Arnd Bergmann authored and Darren Hart committed Jun 15, 2015
1 parent f835857 commit 4b200b4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/platform/x86/ideapad-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,9 @@ static const struct ideapad_rfk_data ideapad_rfk_data[] = {
static int ideapad_rfk_set(void *data, bool blocked)
{
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 = {
Expand Down

0 comments on commit 4b200b4

Please sign in to comment.