[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 07 Jul 2010 13:02:16 -0700
From: "Luck, Tony" <tony.luck@...el.com>
To: feng.tang@...el.com, linux-kernel@...r.kernel.org,
tglx@...utronix.de, mingo@...e.hu, hpa@...or.com,
jacob.jun.pan@...el.com, dtor@...l.ru, randy.dunlap@...cle.com
Cc: Feng Tang <feng.tang@...el.com>
Subject: Re: [PATCH v2 5/5] input: i8042 - add runtime check in x86's i8042_platform_init
From: Feng Tang <feng.tang@...el.com>
Then it will first check x86_platforms's i8042 detection result,
then go on with normal probe.
Cc: Dmitry Torokhov <dtor@...l.ru>
Signed-off-by: Feng Tang <feng.tang@...el.com>
Signed-off-by: Tony Luck <tony.luck@...el.com>
---
Added #ifdef around #include <asm/x86_init.h> -- Tony
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6168469..81003c4 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -7,6 +7,10 @@
* the Free Software Foundation.
*/
+#ifdef CONFIG_X86
+#include <asm/x86_init.h>
+#endif
+
/*
* Names.
*/
@@ -840,6 +844,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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists