[kernel/f21] Add quirk for rfkill on Yoga 3 machines (rhbz 1157327)

[Josh Boyer]

commit b6c1e913532520a917bd03854d46cfd66e56545b
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Tue Oct 28 14:18:25 2014 -0400

    Add quirk for rfkill on Yoga 3 machines (rhbz 1157327)

 kernel.spec                                    |    9 ++++++
 quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch |   33 ++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 225c09d..bad8b46 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -696,6 +696,9 @@ Patch26080: KVM-x86-Emulator-does-not-decode-clflush-well.patch
 Patch26081: KVM-x86-PREFETCH-and-HINT_NOP-should-have-SrcMem-fla.patch
 Patch26082: kvm-fix-excessive-pages-un-pinning-in-kvm_iommu_map-.patch
 
+#rhbz 1157327
+Patch26083: quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1505,6 +1508,9 @@ ApplyPatch KVM-x86-Emulator-does-not-decode-clflush-well.patch
 ApplyPatch KVM-x86-PREFETCH-and-HINT_NOP-should-have-SrcMem-fla.patch
 ApplyPatch kvm-fix-excessive-pages-un-pinning-in-kvm_iommu_map-.patch
 
+#rhbz 1157327
+ApplyPatch quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2373,6 +2379,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Oct 28 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Add quirk for rfkill on Yoga 3 machines (rhbz 1157327)
+
 * Fri Oct 24 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.17.1-304.fc21
 - CVE-2014-3610 kvm: noncanonical MSR writes (rhbz 1144883 1156543)
 - CVE-2014-3611 kvm: PIT timer race condition (rhbz 1144878 1156537)
diff --git a/quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch b/quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
new file mode 100644
index 0000000..3d51741
--- /dev/null
+++ b/quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
@@ -0,0 +1,33 @@
+From: Stephan Mueller <smueller at chronox.de>
+Date: Mon, 27 Oct 2014 04:09:50 +0100
+Subject: [PATCH] quirk for Lenovo Yoga 3: no rfkill switch
+
+The Yoga 3 does not contain any physical rfkill switch. Therefore
+disable the rfkill switch identically to the Yoga 2 approach.
+
+Signed-off-by: Stephan Mueller <smueller at chronox.de>
+---
+ drivers/platform/x86/ideapad-laptop.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
+index 02152de135b5..ed494f37c40f 100644
+--- a/drivers/platform/x86/ideapad-laptop.c
++++ b/drivers/platform/x86/ideapad-laptop.c
+@@ -837,6 +837,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
+ 			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
+ 		},
+ 	},
++	{
++		.ident = "Lenovo Yoga 3 Pro 1370",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3 Pro-1370"),
++		},
++	},
+ 	{}
+ };
+ 
+-- 
+1.9.3
+