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
/
sysfb.c
diff --git
a/arch/x86/kernel/sysfb.c
b/arch/x86/kernel/sysfb.c
index
193ec2c
..
160386e
100644
(file)
--- a/
arch/x86/kernel/sysfb.c
+++ b/
arch/x86/kernel/sysfb.c
@@
-67,7
+67,7
@@
static __init int sysfb_init(void)
pd = platform_device_register_resndata(NULL, name, 0,
NULL, 0, si, sizeof(*si));
- return
IS_ERR(pd) ? PTR_ERR(pd) : 0
;
+ return
PTR_ERR_OR_ZERO(pd)
;
}
/* must execute after PCI subsystem for EFI quirks */