From: Tobias Klauser Date: Fri, 31 Oct 2014 16:16:41 +0000 (-0700) Subject: Input: altera_ps2 - use correct type for irq return value X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5f77fc456cd6d3f6961459d2d279f2698c545184;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Input: altera_ps2 - use correct type for irq return value The irq function altera_ps2_rxint returns an irqreturn_t, so use the same type for variable storing the return value. Signed-off-by: Tobias Klauser Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index e0371e182a2a..58781c8a8aec 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c @@ -37,7 +37,7 @@ static irqreturn_t altera_ps2_rxint(int irq, void *dev_id) { struct ps2if *ps2if = dev_id; unsigned int status; - int handled = IRQ_NONE; + irqreturn_t handled = IRQ_NONE; while ((status = readl(ps2if->base)) & 0xffff0000) { serio_interrupt(ps2if->io, status & 0xff, 0);