aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-12-22 10:32:38 +0100
committerThomas Gleixner <tglx@linutronix.de>2016-12-25 10:47:41 +0100
commit59fefd0890f12716b39de1d4e5482fd739316262 (patch)
treefa3707ffd6c5caae7395b8233479175e42af60b4
parentbus: arm-ccn: Prevent hotplug callback leak (diff)
downloadlinux-dev-59fefd0890f12716b39de1d4e5482fd739316262.tar.xz
linux-dev-59fefd0890f12716b39de1d4e5482fd739316262.zip
x86/msr: Remove bogus cleanup from the error path
The error cleanup which is invoked when the hotplug state setup failed tries to remove the failed state, which is broken. Fixes: 8fba38c937cd ("x86/msr: Convert to hotplug state machine") Reported-by: kernel test robot <fengguang.wu@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Sebastian Siewior <bigeasy@linutronix.de>
-rw-r--r--arch/x86/kernel/msr.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index f5e3ff835cc8..ef688804f80d 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -224,7 +224,6 @@ static int __init msr_init(void)
return 0;
out_class:
- cpuhp_remove_state(cpuhp_msr_state);
class_destroy(msr_class);
out_chrdev:
__unregister_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr");