From ba455ab11fde0e5d0de6c5f83f8492747d9b109d Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Thu, 23 May 2013 16:12:08 -0400
Subject: [PATCH] Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367)

---
 hp-wmi-fix-incorrect-rfkill-set-hw-state.patch | 13 +++++++++++++
 kernel.spec                                    | 11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 hp-wmi-fix-incorrect-rfkill-set-hw-state.patch

diff --git a/hp-wmi-fix-incorrect-rfkill-set-hw-state.patch b/hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
new file mode 100644
index 000000000..07f27b6c2
--- /dev/null
+++ b/hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
+index 8df0c5a..d111c86 100644
+--- a/drivers/platform/x86/hp-wmi.c
++++ b/drivers/platform/x86/hp-wmi.c
+@@ -703,7 +703,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device)
+ 		}
+ 		rfkill_init_sw_state(gps_rfkill,
+ 				     hp_wmi_get_sw_state(HPWMI_GPS));
+-		rfkill_set_hw_state(bluetooth_rfkill,
++		rfkill_set_hw_state(gps_rfkill,
+ 				    hp_wmi_get_hw_state(HPWMI_GPS));
+ 		err = rfkill_register(gps_rfkill);
+ 		if (err)
diff --git a/kernel.spec b/kernel.spec
index 823b7f99d..5402a513a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -731,6 +731,9 @@ Patch23006: fix-child-thread-introspection.patch
 #rhbz 961527
 Patch25021: radeon-use-max_bus-speed-to-activate-gen2-speeds.patch
 
+#rhbz 964367
+Patch25023: hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1409,6 +1412,9 @@ ApplyPatch fix-child-thread-introspection.patch
 #rhbz 961527
 ApplyPatch radeon-use-max_bus-speed-to-activate-gen2-speeds.patch
 
+#rhbz 964367
+ApplyPatch hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2212,6 +2218,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu May 23 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367)
+
 * Wed May 22 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc2.git1.1
 - Linux v3.10-rc2-68-gbb3ec6b
 - Reenable debugging options.