1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 1a0cea3c5294..13da06fd0b8f 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -280,7 +280,14 @@ static void i8042_stop(struct serio *serio)
         struct i8042_port *port = serio->port_data;
 
         port->exists = 0;
-        synchronize_sched();
+
+        /*
+         * We synchronize with both AUX and KBD IRQs because there is
+         * a (very unlikely) chance that AUX IRQ is raised for KBD port
+         * and vice versa.
+         */
+        synchronize_irq(I8042_AUX_IRQ);
+        synchronize_irq(I8042_KBD_IRQ);
         port->serio = NULL;
 }