From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758215Ab0GEOou (ORCPT ); Mon, 5 Jul 2010 10:44:50 -0400 Received: from mga03.intel.com ([143.182.124.21]:32392 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758170Ab0GEOor (ORCPT ); Mon, 5 Jul 2010 10:44:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,540,1272870000"; d="scan'208";a="296676701" From: feng.tang@intel.com To: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, jacob.jun.pan@intel.com, dtor@mail.ru, randy.dunlap@oracle.com Cc: Feng Tang Subject: [PATCH v2 5/5] input: i8042 - add runtime check in x86's i8042_platform_init Date: Mon, 5 Jul 2010 23:03:22 +0800 Message-Id: <1278342202-10973-6-git-send-email-feng.tang@intel.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1278342202-10973-1-git-send-email-feng.tang@intel.com> References: <1278342202-10973-1-git-send-email-feng.tang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Feng Tang Then it will first check x86_platforms's i8042 detection result, then go on with normal probe. Cc: Dmitry Torokhov Signed-off-by: Feng Tang --- drivers/input/serio/i8042-x86ia64io.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 6168469..6228526 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -7,6 +7,8 @@ * the Free Software Foundation. */ +#include + /* * Names. */ @@ -840,6 +842,12 @@ static int __init i8042_platform_init(void) { int retval; +#ifdef CONFIG_X86 + /* Just return if pre-detection shows no i8042 controller exist */ + if (!x86_platform.i8042_detect()) + return -ENODEV; +#endif + /* * On ix86 platforms touching the i8042 data register region can do really * bad things. Because of this the region is always reserved on ix86 boxes. -- 1.7.0.4