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 <feng.tang@intel.com>
Subject: [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init
Date: Fri, 2 Jul 2010 16:35:16 +0800 [thread overview]
Message-ID: <1278059716-7147-6-git-send-email-feng.tang@intel.com> (raw)
In-Reply-To: <1278059716-7147-1-git-send-email-feng.tang@intel.com>
From: Feng Tang <feng.tang@intel.com>
Then it will first check x86_platforms's i8042 detection result,
then go on with normal probe.
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
drivers/input/serio/i8042-x86ia64io.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6168469..2e14fc5 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -840,6 +840,10 @@ static int __init i8042_platform_init(void)
{
int retval;
+ /* Just return if pre-detection shows no i8042 controller exist */
+ if (!x86_platform.i8042_detect())
+ return -ENODEV;
+
/*
* 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
next prev parent reply other threads:[~2010-07-02 8:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-02 8:35 [PATCH 0/5] patches to settle i8042 with Intel MID platforms feng.tang
2010-07-02 8:35 ` [PATCH 1/5] x86: add i8042 pre-detection hook to x86_platform_ops feng.tang
2010-07-02 8:35 ` [PATCH 2/5] x86, mrst: add i8042_detect API for Moorestwon platform feng.tang
2010-07-02 8:35 ` [PATCH 3/5] Revert "Input: do not force selecting i8042 on Moorestown" feng.tang
2010-07-02 8:35 ` [PATCH 4/5] Revert "Input: fixup X86_MRST selects" feng.tang
2010-07-02 8:35 ` feng.tang [this message]
2010-07-02 16:59 ` [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init Dmitry Torokhov
2010-07-02 20:53 ` Thomas Gleixner
2010-07-02 20:58 ` H. Peter Anvin
2010-07-08 20:11 ` Luck, Tony
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1278059716-7147-6-git-send-email-feng.tang@intel.com \
--to=feng.tang@intel.com \
--cc=dtor@mail.ru \
--cc=hpa@zytor.com \
--cc=jacob.jun.pan@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=randy.dunlap@oracle.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®