Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367)
This commit is contained in:
parent
1656aee902
commit
231a6c6746
|
@ -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)
|
11
kernel.spec
11
kernel.spec
|
@ -54,7 +54,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 100
|
||||
%global baserelease 101
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -739,6 +739,9 @@ Patch25007: fix-child-thread-introspection.patch
|
|||
|
||||
Patch25022: iwlwifi-dvm-fix-memset.patch
|
||||
|
||||
#rhbz 964367
|
||||
Patch25023: hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -1432,6 +1435,9 @@ ApplyPatch fix-child-thread-introspection.patch
|
|||
|
||||
ApplyPatch iwlwifi-dvm-fix-memset.patch
|
||||
|
||||
#rhbz 964367
|
||||
ApplyPatch hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -2283,6 +2289,9 @@ fi
|
|||
# '-' | |
|
||||
# '-'
|
||||
%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 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Update ARM configs for 3.9
|
||||
|
||||
|
|
Loading…
Reference in New Issue