Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 350375
b: refs/heads/master
c: bbae92c
h: refs/heads/master
i:
  350373: 867aa25
  350371: 42221a9
  350367: 02506fc
v: v3
  • Loading branch information
Mark Brown committed Jan 3, 2013
1 parent 1bb810f commit d3780fa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 55ac85e942c6783e728964861df36fc80e8ced93
refs/heads/master: bbae92ca49f77898277576e3377b09e1391a3271
16 changes: 9 additions & 7 deletions trunk/drivers/base/regmap/regmap-irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
}
}

/*
* Ignore masked IRQs and ack if we need to; we ack early so
* there is no race between handling and acknowleding the
* interrupt. We assume that typically few of the interrupts
* will fire simultaneously so don't worry about overhead from
* doing a write per register.
*/
for (i = 0; i < data->chip->num_regs; i++) {
ret = regmap_read(map, chip->status_base + (i * map->reg_stride
* data->irq_reg_stride),
Expand All @@ -189,7 +182,16 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
pm_runtime_put(map->dev);
return IRQ_NONE;
}
}

/*
* Ignore masked IRQs and ack if we need to; we ack early so
* there is no race between handling and acknowleding the
* interrupt. We assume that typically few of the interrupts
* will fire simultaneously so don't worry about overhead from
* doing a write per register.
*/
for (i = 0; i < data->chip->num_regs; i++) {
data->status_buf[i] &= ~data->mask_buf[i];

if (data->status_buf[i] && chip->ack_base) {
Expand Down

0 comments on commit d3780fa

Please sign in to comment.