From: Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
Date: Thu, 30 Aug 2007 04:04:15 +0000 (-0400)
Subject: Input: i8042 - fix retrun value of i8042_aux_test_irq
X-Git-Tag: v2.6.23-rc5~40^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e3758b2ab61b3001b9db4582559bbaeba5e24a29;p=~emulex%2Finfiniband.git

Input: i8042 - fix retrun value of i8042_aux_test_irq

We should not return IRQ_HANDLED if we didn't handle the interrupt.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 3888dc307e0..06b05dd2248 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -512,6 +512,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
 	unsigned long flags;
 	unsigned char str, data;
+	int ret = 0;
 
 	spin_lock_irqsave(&i8042_lock, flags);
 	str = i8042_read_status();
@@ -520,10 +521,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 		if (i8042_irq_being_tested &&
 		    data == 0xa5 && (str & I8042_STR_AUXDATA))
 			complete(&i8042_aux_irq_delivered);
+		ret = 1;
 	}
 	spin_unlock_irqrestore(&i8042_lock, flags);
 
-	return IRQ_HANDLED;
+	return IRQ_RETVAL(ret);
 }
 
 /*