diff options
author | Nick Dyer <nick.dyer@itdev.co.uk> | 2014-05-19 02:00:56 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-19 02:27:22 -0400 |
commit | 8d4e1639066ff27e8c2c51b69b5ce2308da5c41c (patch) | |
tree | 7126fcd8192a62ba6f280f416fa68eee6146ad1b | |
parent | fb5e4c3ee140b29e1935b4bbb19c319177bed231 (diff) |
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>
-rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 3 |
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 65df362cf327..0cff8bb2ad75 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) | |||
590 | do { | 590 | do { |
591 | if (mxt_read_message(data, &message)) { | 591 | if (mxt_read_message(data, &message)) { |
592 | dev_err(dev, "Failed to read message\n"); | 592 | dev_err(dev, "Failed to read message\n"); |
593 | goto end; | 593 | return IRQ_NONE; |
594 | } | 594 | } |
595 | 595 | ||
596 | reportid = message.reportid; | 596 | reportid = message.reportid; |
@@ -617,7 +617,6 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id) | |||
617 | input_sync(data->input_dev); | 617 | input_sync(data->input_dev); |
618 | } | 618 | } |
619 | 619 | ||
620 | end: | ||
621 | return IRQ_HANDLED; | 620 | return IRQ_HANDLED; |
622 | } | 621 | } |
623 | 622 | ||