Skip to content

Commit

Permalink
Input: i8042 - fix retrun value of i8042_aux_test_irq
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fernando Luis Vázquez Cao authored and Dmitry Torokhov committed Aug 30, 2007
1 parent 29e8277 commit e3758b2
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/input/serio/i8042.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
}

/*
Expand Down

0 comments on commit e3758b2

Please sign in to comment.