From df886e6cfed2cc6cb16cd72ef7a55731e5ea6336 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 18 Jan 2007 00:42:31 -0500 Subject: [PATCH] --- yaml --- r: 47815 b: refs/heads/master c: 19f3c3e37314a234998fd75f5ea9388dfb6ab00a h: refs/heads/master i: 47813: cc88e31bbbbcbe553693566956a363a13a516614 47811: b4cc4ec34b356b8505222b6218251d9a42572cf2 47807: dbae77ea17ef935c220e0196bb995db400a70dab v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e60ddb01e26f..c6c04743bb6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65a2d2258e0f29371606aa0f7f4258e618ecebe8 +refs/heads/master: 19f3c3e37314a234998fd75f5ea9388dfb6ab00a diff --git a/trunk/drivers/input/serio/i8042.c b/trunk/drivers/input/serio/i8042.c index debe9445488c..1364c7964db4 100644 --- a/trunk/drivers/input/serio/i8042.c +++ b/trunk/drivers/input/serio/i8042.c @@ -371,7 +371,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id) if (unlikely(i8042_suppress_kbd_ack)) if (port_no == I8042_KBD_PORT_NO && (data == 0xfa || data == 0xfe)) { - i8042_suppress_kbd_ack = 0; + i8042_suppress_kbd_ack--; goto out; } @@ -838,13 +838,14 @@ static long i8042_panic_blink(long count) led ^= 0x01 | 0x04; while (i8042_read_status() & I8042_STR_IBF) DELAY; - i8042_suppress_kbd_ack = 1; + dbg("%02x -> i8042 (panic blink)", 0xed); + i8042_suppress_kbd_ack = 2; i8042_write_data(0xed); /* set leds */ DELAY; while (i8042_read_status() & I8042_STR_IBF) DELAY; DELAY; - i8042_suppress_kbd_ack = 1; + dbg("%02x -> i8042 (panic blink)", led); i8042_write_data(led); DELAY; last_blink = count;