summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-03-21 11:56:11 +0100
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:14:35 +0200
commit731d0c16b820fb904679e35bbb7da0af9a5cc4b1 (patch)
treebed3ace998139753ab7b7e098d71bbe64f42afe4 /drivers
parentdc4ab7fd6482a2e0d8901daa91561d1bd8d54371 (diff)
mfd: stmpe: Recheck the status to avoid failure stmpe: add stmpe documentation to DocBook
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/stmpe.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 7ab7746631d..a791d415e8d 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -674,7 +674,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)
ret = stmpe_block_read(stmpe, israddr, num, isr);
if (ret < 0)
return IRQ_NONE;
-
+back:
for (i = 0; i < num; i++) {
int bank = num - i - 1;
u8 status = isr[i];
@@ -696,6 +696,22 @@ static irqreturn_t stmpe_irq(int irq, void *data)
stmpe_reg_write(stmpe, israddr + i, clear);
}
+ /*
+ It may happen that on the first status read interrupt
+ sources may not showup, so read one more time.
+ */
+ ret = stmpe_block_read(stmpe, israddr, num, isr);
+ if (ret >= 0) {
+ for (i = 0; i < num; i++) {
+ int bank = num - i - 1;
+ u8 status = isr[i];
+
+ status &= stmpe->ier[bank];
+ if (status)
+ goto back;
+ }
+ }
+
return IRQ_HANDLED;
}