aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-09-04 00:45:34 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-09-11 01:09:40 -0400
commit1c7827ae70e7c8456e08f7bb9ef2238d27814cbe (patch)
tree70d6dc74fad758801d7a9c1cebfd812e81cccd29 /drivers/input/serio/i8042.c
parent41c372dcad935fe7c27ec45211bad810515110bd (diff)
Input: i8042 - bypass AUX IRQ delivery test on laptops
It seems that many laptops do not fully implement AUX LOOP command in their keyboard controllers, causing issues with touchpad detection. We know however that almost every laptop/portable uses a PS/2 pointing device and, even if user disables it in favor of an external mouse, the system will not use IRQ 12 for anything else. Therefore we may bypass AUX IRQ delivery test when running on a laptop and assume that it is routed properly. Just to be safe we require the box to have good PNP data in order to bypass the test. [Jin Dongming <jin.dongming@np.css.fujitsu.com>: fix crash caused by missing terminator in the DMI table] Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042.c')
-rw-r--r--drivers/input/serio/i8042.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 9f5c0506242f..b53a015bf8a5 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -83,6 +83,8 @@ module_param_named(debug, i8042_debug, bool, 0600);
83MODULE_PARM_DESC(debug, "Turn i8042 debugging mode on and off"); 83MODULE_PARM_DESC(debug, "Turn i8042 debugging mode on and off");
84#endif 84#endif
85 85
86static bool i8042_bypass_aux_irq_test;
87
86#include "i8042.h" 88#include "i8042.h"
87 89
88static DEFINE_SPINLOCK(i8042_lock); 90static DEFINE_SPINLOCK(i8042_lock);
@@ -641,7 +643,7 @@ static int __devinit i8042_check_aux(void)
641 * used it for a PCI card or somethig else. 643 * used it for a PCI card or somethig else.
642 */ 644 */
643 645
644 if (i8042_noloop || aux_loop_broken) { 646 if (i8042_noloop || i8042_bypass_aux_irq_test || aux_loop_broken) {
645/* 647/*
646 * Without LOOP command we can't test AUX IRQ delivery. Assume the port 648 * Without LOOP command we can't test AUX IRQ delivery. Assume the port
647 * is working and hope we are right. 649 * is working and hope we are right.