projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
cpuid.c
diff --git
a/arch/x86/kernel/cpuid.c
b/arch/x86/kernel/cpuid.c
index
3225ae6
..
83741a7
100644
(file)
--- a/
arch/x86/kernel/cpuid.c
+++ b/
arch/x86/kernel/cpuid.c
@@
-143,7
+143,7
@@
static int cpuid_device_create(int cpu)
dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL,
"cpu%d", cpu);
- return
IS_ERR(dev) ? PTR_ERR(dev) : 0
;
+ return
PTR_ERR_OR_ZERO(dev)
;
}
static void cpuid_device_destroy(int cpu)