summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-10-31 09:16:41 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-31 09:32:02 -0700
commit5f77fc456cd6d3f6961459d2d279f2698c545184 (patch)
tree06e3dd10bc5f3b6dc5645f5d8ec6514409990b2f /drivers/input
parentd0269b8475020718afd7f559064698f5500fa879 (diff)
downloadop-kernel-dev-5f77fc456cd6d3f6961459d2d279f2698c545184.zip
op-kernel-dev-5f77fc456cd6d3f6961459d2d279f2698c545184.tar.gz
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 <tklauser@distanz.ch> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/altera_ps2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index e0371e1..58781c8 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);
OpenPOWER on IntegriCloud