1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index debe9445488c..c3fdfc1f342a 100644
--- a/drivers/input/serio/i8042.c
+++ b/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;
                 }
 
@@ -543,6 +543,7 @@ static int __devinit i8042_check_aux(void)
 {
         int retval = -1;
         int irq_registered = 0;
+        int aux_loop_broken = 0;
         unsigned long flags;
         unsigned char param;
 
@@ -572,6 +573,8 @@ static int __devinit i8042_check_aux(void)
                 if (i8042_command(&param, I8042_CMD_AUX_TEST) ||
                     (param && param != 0xfa && param != 0xff))
                         return -1;
+
+                aux_loop_broken = 1;
         }
 
 /*
@@ -595,7 +598,7 @@ static int __devinit i8042_check_aux(void)
  * used it for a PCI card or somethig else.
  */
 
-        if (i8042_noloop) {
+        if (i8042_noloop || aux_loop_broken) {
 /*
  * Without LOOP command we can't test AUX IRQ delivery. Assume the port
  * is working and hope we are right.
@@ -838,13 +841,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;