From eb7e51aa6462ac177b562af0f452cbbcb19ff029 Mon Sep 17 00:00:00 2001 From: Sundar Iyer Date: Mon, 13 Dec 2010 09:33:16 +0530 Subject: [PATCH] --- yaml --- r: 226023 b: refs/heads/master c: bd77efd0cea80865d4cfcc1e4b62789c51a74b2d h: refs/heads/master i: 226021: ccbc12cbb344597253b61753f10375c06b49d268 226019: ae6155899d58d71b344da7a21d7e9df46fdfa81e 226015: e52f4e4a6a13ab7b49de3276ec7d44e063ab2207 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tc3589x.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a2452199a36..17d0256f907c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 611b7590afa6e6c6b0942b1d3efef17fbb348ef5 +refs/heads/master: bd77efd0cea80865d4cfcc1e4b62789c51a74b2d diff --git a/trunk/drivers/mfd/tc3589x.c b/trunk/drivers/mfd/tc3589x.c index 0ed9669d95fa..708349a5c0e3 100644 --- a/trunk/drivers/mfd/tc3589x.c +++ b/trunk/drivers/mfd/tc3589x.c @@ -142,6 +142,7 @@ static irqreturn_t tc3589x_irq(int irq, void *data) struct tc3589x *tc3589x = data; int status; +again: status = tc3589x_reg_read(tc3589x, TC3589x_IRQST); if (status < 0) return IRQ_NONE; @@ -156,9 +157,12 @@ static irqreturn_t tc3589x_irq(int irq, void *data) /* * A dummy read or write (to any register) appears to be necessary to * have the last interrupt clear (for example, GPIO IC write) take - * effect. + * effect. In such a case, recheck for any interrupt which is still + * pending. */ - tc3589x_reg_read(tc3589x, TC3589x_IRQST); + status = tc3589x_reg_read(tc3589x, TC3589x_IRQST); + if (status) + goto again; return IRQ_HANDLED; }