Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3758b2a authored by Fernando Luis Vázquez Cao's avatar Fernando Luis Vázquez Cao Committed by Dmitry Torokhov
Browse files

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: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 29e8277d

drivers/input/serio/i8042.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

}



/*