Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
drivers
/
platform
/
x86
/
ideapad-laptop.c
diff --git
a/kernel/drivers/platform/x86/ideapad-laptop.c
b/kernel/drivers/platform/x86/ideapad-laptop.c
index
b496db8
..
cd78f11
100644
(file)
--- a/
kernel/drivers/platform/x86/ideapad-laptop.c
+++ b/
kernel/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;
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 = {
@@
-836,6
+837,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 = {
@@
-843,6
+851,13
@@
static const struct dmi_system_id no_hw_rfkill_list[] = {
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
},
},
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
},
},
+ {
+ .ident = "Lenovo Yoga 3 14",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 3 14"),
+ },
+ },
{
.ident = "Lenovo Yoga 3 Pro 1370",
.matches = {
{
.ident = "Lenovo Yoga 3 Pro 1370",
.matches = {