git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
msr.c
diff --git
a/arch/x86/kernel/msr.c
b/arch/x86/kernel/msr.c
index
4d4468e
..
7bf2dc4
100644
(file)
--- a/
arch/x86/kernel/msr.c
+++ b/
arch/x86/kernel/msr.c
@@
-230,7
+230,7
@@
static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
msr_device_destroy(cpu);
break;
}
- return
err ? NOTIFY_BAD : NOTIFY_OK
;
+ return
notifier_from_errno(err)
;
}
static struct notifier_block __refdata msr_class_cpu_notifier = {