]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
m68k/q40: Add missing platform check before registering platform devices
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 18 Mar 2012 12:20:27 +0000 (13:20 +0100)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 1 Apr 2012 20:57:53 +0000 (22:57 +0200)
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>
arch/m68k/q40/config.c

index 512adb64f7dd574bbe11613ddc21fc75e80bfcf1..8a1ce327c963da94dffa388f2fff533260467679 100644 (file)
@@ -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);