projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
platform
/
x86
/
ideapad-laptop.c
diff --git
a/drivers/platform/x86/ideapad-laptop.c
b/drivers/platform/x86/ideapad-laptop.c
index bea0228309443e1031607b09e0eef85e45b6011e..76b57388d01b5b73838bd3ab73741b5c096148d7 100644
(file)
--- a/
drivers/platform/x86/ideapad-laptop.c
+++ b/
drivers/platform/x86/ideapad-laptop.c
@@
-465,8
+465,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;
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 = {
}
static struct rfkill_ops ideapad_rfk_ops = {
@@
-837,6
+838,13
@@
static const struct dmi_system_id no_hw_rfkill_list[] = {
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
},
},
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
},
},
+ {
+ .ident = "Lenovo G50-30",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G50-30"),
+ },
+ },
{
.ident = "Lenovo Yoga 2 11 / 13 / Pro",
.matches = {
{
.ident = "Lenovo Yoga 2 11 / 13 / Pro",
.matches = {