From ceb46fe6f1c946d59df2858f6740204322d65d18 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 8 Oct 2009 20:58:13 -0700 Subject: [PATCH] --- yaml --- r: 167206 b: refs/heads/master c: d3d2dfe2d723051cac323017af5d0180ba8de4c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8b26fc1fa317..7354e035a339 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fed94549edc90b15fb3cd13e79026db51d6d55ce +refs/heads/master: d3d2dfe2d723051cac323017af5d0180ba8de4c1 diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c index bc56e52b945f..a31578170ccc 100644 --- a/trunk/drivers/input/serio/i8042.c +++ b/trunk/drivers/input/serio/i8042.c @@ -609,6 +609,8 @@ static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id) str = i8042_read_status(); if (str & I8042_STR_OBF) { data = i8042_read_data(); + dbg("%02x <- i8042 (aux_test_irq, %s)", + data, str & I8042_STR_AUXDATA ? "aux" : "kbd"); if (i8042_irq_being_tested && data == 0xa5 && (str & I8042_STR_AUXDATA)) complete(&i8042_aux_irq_delivered); @@ -750,6 +752,7 @@ static int __init i8042_check_aux(void) * AUX IRQ was never delivered so we need to flush the controller to * get rid of the byte we put there; otherwise keyboard may not work. */ + dbg(" -- i8042 (aux irq test timeout)"); i8042_flush(); retval = -1; }