OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7224c0d
)
m68k/mac: Add missing platform check before registering platform devices
author
Geert Uytterhoeven
<geert@linux-m68k.org>
Sun, 18 Mar 2012 12:21:38 +0000
(13:21 +0100)
committer
Geert Uytterhoeven
<geert@linux-m68k.org>
Sun, 1 Apr 2012 20:57:51 +0000
(22:57 +0200)
On multi-platform kernels, the Mac platform devices should be registered
when running on Mac only. Else it may crash later.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: stable@vger.kernel.org
arch/m68k/mac/config.c
patch
|
blob
|
history
diff --git
a/arch/m68k/mac/config.c
b/arch/m68k/mac/config.c
index
96fa6ed
..
d9f62e0
100644
(file)
--- a/
arch/m68k/mac/config.c
+++ b/
arch/m68k/mac/config.c
@@
-980,6
+980,9
@@
int __init mac_platform_init(void)
{
u8 *swim_base;
+ if (!MACH_IS_MAC)
+ return -ENODEV;
+
/*
* Serial devices
*/