evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'regmap/topic/irq' into regmap-next

Browse source
This commit is contained in:
Mark Brown 2011-11-28 18:52:24 +00:00
commit c86845dc7b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/base/regmap/regmap-irq.c
View file

@ -100,6 +100,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
u8 *buf8 = data->status_reg_buf; u8 *buf8 = data->status_reg_buf;
u16 *buf16 = data->status_reg_buf; u16 *buf16 = data->status_reg_buf;
u32 *buf32 = data->status_reg_buf; u32 *buf32 = data->status_reg_buf;
bool handled = false;
ret = regmap_bulk_read(map, chip->status_base, data->status_reg_buf, ret = regmap_bulk_read(map, chip->status_base, data->status_reg_buf,
chip->num_regs); chip->num_regs);
@ -146,10 +147,14 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
if (data->status_buf[chip->irqs[i].reg_offset] & if (data->status_buf[chip->irqs[i].reg_offset] &
chip->irqs[i].mask) { chip->irqs[i].mask) {
handle_nested_irq(data->irq_base + i); handle_nested_irq(data->irq_base + i);
handled = true;
} }
} }
return IRQ_HANDLED; if (handled)
return IRQ_HANDLED;
else
return IRQ_NONE;
} }
/** /**