diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-06-13 15:23:33 +0200 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2015-06-15 13:28:03 -0700 |
| commit | 4b200b4604bec3388426159f1656109d19fadf6e (patch) | |
| tree | cfb2bc7df3208db207707559be1daf2171286a7b /drivers/platform | |
| parent | f8358578e2f23bd82d0454c17676bdb28a40664a (diff) | |
| download | linux-stable-4b200b4604bec3388426159f1656109d19fadf6e.tar.gz linux-stable-4b200b4604bec3388426159f1656109d19fadf6e.tar.bz2 linux-stable-4b200b4604bec3388426159f1656109d19fadf6e.zip | |
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 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)")
Cc: stable@vger.kernel.org # v2.6.38+
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/ideapad-laptop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index 1db3d2176d56..1bd34dbfe73a 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -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 = { |