summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorNick Dyer <nick.dyer@itdev.co.uk>2014-05-19 06:00:56 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-19 06:27:22 (GMT)
commit8d4e1639066ff27e8c2c51b69b5ce2308da5c41c (patch)
tree7126fcd8192a62ba6f280f416fa68eee6146ad1b /drivers/input
parentfb5e4c3ee140b29e1935b4bbb19c319177bed231 (diff)
downloadlinux-8d4e1639066ff27e8c2c51b69b5ce2308da5c41c.tar.xz
Input: atmel_mxt_ts - return IRQ_NONE when interrupt handler fails
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 65df362..0cff8bb 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -590,7 +590,7 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
do {
if (mxt_read_message(data, &message)) {
dev_err(dev, "Failed to read message\n");
- goto end;
+ return IRQ_NONE;
}
reportid = message.reportid;
@@ -617,7 +617,6 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
input_sync(data->input_dev);
}
-end:
return IRQ_HANDLED;
}