X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fmsr.c;h=1f3abe048e93ea3dd0aaa06225deb8a577904fc6;hb=d23b200a75f78e62744c3c25d078855eec8a689b;hp=4dfb4053005714bb222f19d821856ccb19cadd7a;hpb=cf816ecb533ab96b883dfdc0db174598b5b5c4d2;p=linux-2.6

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 4dfb405300..1f3abe048e 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -162,12 +162,10 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
 		err = msr_device_create(cpu);
 		break;
 	case CPU_UP_CANCELED:
+	case CPU_UP_CANCELED_FROZEN:
 	case CPU_DEAD:
 		msr_device_destroy(cpu);
 		break;
-	case CPU_UP_CANCELED_FROZEN:
-		destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu));
-		break;
 	}
 	return err ? NOTIFY_BAD : NOTIFY_OK;
 }