Don't read i8042 data if no data exists

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 1fb178904b13dda9fe57e7eb0b22cf69d286d709..144bb86256fba36f56fb4ad11c1de105957fd100 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -375,13 +375,14 @@ static char i8042_mux_phys[4][32];
 static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        unsigned long flags;
-       unsigned char str, data;
+       unsigned char str, data = 0;
        unsigned int dfl;
        int ret;
 
        spin_lock_irqsave(&i8042_lock, flags);
        str = i8042_read_status();
-       data = i8042_read_data();
+       if (str & I8042_STR_OBF)
+               data = i8042_read_data();
        spin_unlock_irqrestore(&i8042_lock, flags);
 
        if (~str & I8042_STR_OBF) {