releases/4.19.34/platform-x86-ideapad-laptop-fix-no_hw_rfkill_list-fo.patch

   1 From 9f6cf43e315c08b665be93b358c621cf07a1f427 Mon Sep 17 00:00:00 2001
   2 From: Yang Fan <nullptr.cpp@gmail.com>
   3 Date: Sat, 19 Jan 2019 19:16:33 +0800
   4 Subject: platform/x86: ideapad-laptop: Fix no_hw_rfkill_list for Lenovo
   5  RESCUER R720-15IKBN
   6
   7 [ Upstream commit 4d9b2864a415fec39150bc13efc730c7eb88711e ]
   8
   9 Commit ae7c8cba3221 ("platform/x86: ideapad-laptop: add lenovo RESCUER
  10 R720-15IKBN to no_hw_rfkill_list") added
  11     DMI_MATCH(DMI_BOARD_NAME, "80WW")
  12 for Lenovo RESCUER R720-15IKBN.
  13
  14 But DMI_BOARD_NAME does not match 80WW on Lenovo RESCUER R720-15IKBN,
  15 thus cause Wireless LAN still be hard blocked.
  16
  17 On Lenovo RESCUER R720-15IKBN:
  18     ~$ cat /sys/class/dmi/id/sys_vendor
  19     LENOVO
  20     ~$ cat /sys/class/dmi/id/board_name
  21     Provence-5R3
  22     ~$ cat /sys/class/dmi/id/product_name
  23     80WW
  24     ~$ cat /sys/class/dmi/id/product_version
  25     Lenovo R720-15IKBN
  26
  27 So on Lenovo RESCUER R720-15IKBN:
  28     DMI_SYS_VENDOR should match "LENOVO",
  29     DMI_BOARD_NAME should match "Provence-5R3",
  30     DMI_PRODUCT_NAME should match "80WW",
  31     DMI_PRODUCT_VERSION should match "Lenovo R720-15IKBN".
  32
  33 Fix it, and in according with other entries in no_hw_rfkill_list,
  34 use DMI_PRODUCT_VERSION instead of DMI_BOARD_NAME.
  35
  36 Fixes: ae7c8cba3221 ("platform/x86: ideapad-laptop: add lenovo RESCUER R720-15IKBN to no_hw_rfkill_list")
  37 Signed-off-by: Yang Fan <nullptr.cpp@gmail.com>
  38 Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
  39 Signed-off-by: Sasha Levin <sashal@kernel.org>
  40 ---
  41  drivers/platform/x86/ideapad-laptop.c | 2 +-
  42  1 file changed, 1 insertion(+), 1 deletion(-)
  43
  44 diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
  45 index d4f1259ff5a2..62d4b94e2531 100644
  46 --- a/drivers/platform/x86/ideapad-laptop.c
  47 +++ b/drivers/platform/x86/ideapad-laptop.c
  48 @@ -989,7 +989,7 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
  49                 .ident = "Lenovo RESCUER R720-15IKBN",
  50                 .matches = {
  51                         DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
  52 -                       DMI_MATCH(DMI_BOARD_NAME, "80WW"),
  53 +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo R720-15IKBN"),
  54                 },
  55         },
  56         {
  57 --
  58 2.19.1
  59