From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755985Ab2CZUNW (ORCPT ); Mon, 26 Mar 2012 16:13:22 -0400 Received: from jacques.telenet-ops.be ([195.130.132.50]:36154 "EHLO jacques.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755408Ab2CZUNS (ORCPT ); Mon, 26 Mar 2012 16:13:18 -0400 From: Geert Uytterhoeven To: linux-m68k@vger.kernel.org Cc: Dmitry Torokhov , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] m68k/q40: Add missing platform check before registering platform devices Date: Mon, 26 Mar 2012 22:13:13 +0200 Message-Id: <1332792793-31174-1-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- As this weas introduced after v3.3, I'll queue this up together with the other critical MACH_IS_* patches after v3.4-rc1 is released. arch/m68k/q40/config.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index be93648..ba5452f 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -335,6 +335,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); -- 1.7.0.4