Don't read i8042 data if no data exists

2da32132 · Linus Torvalds · b426ad96 · 2da32132
Commit 2da32132 authored Feb 08, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

drivers/input/serio/i8042.c drivers/input/serio/i8042.c +3 -2

No files found.
--- 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) {