From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 18 Mar 2012 12:20:27 +0000 (+0100)
Subject: m68k/q40: Add missing platform check before registering platform devices
X-Git-Tag: MMI-PSA29.97-13-9~17073^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=450aed725c9a53282483c48ebd012feefae94a07;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

m68k/q40: Add missing platform check before registering platform devices

On multi-platform kernels, the Q40/Q60 platform devices should be
registered when running on Q40/Q60 only. Else it may crash later.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 512adb64f7dd..8a1ce327c963 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -334,6 +334,9 @@ static __init int q40_add_kbd_device(void)
 {
 	struct platform_device *pdev;
 
+	if (!MACH_IS_Q40)
+		return -ENODEV;
+
 	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
 	if (IS_ERR(pdev))
 		return PTR_ERR(pdev);