summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-05 11:14:33 +0000
committerMark Brown <broonie@kernel.org>2014-12-05 11:14:33 +0000
commit70c97e3b11e9f92b5fdd6404ff44dd8cf9d0e26e (patch)
treed3ccca81a037963755b436333d0e7219190bc5f4 /drivers
parent009d0431c3914de64666bec0d350e54fdd59df6a (diff)
parent8ad365c94f45c63f2a65dd3814d1db27c388e20e (diff)
Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/da9063-regulator.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index 7c9461d13313..37dd42759ca9 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -867,17 +867,14 @@ static int da9063_regulator_probe(struct platform_device *pdev)
return irq;
}
- regulators->irq_ldo_lim = regmap_irq_get_virq(da9063->regmap_irq, irq);
- if (regulators->irq_ldo_lim >= 0) {
- ret = request_threaded_irq(regulators->irq_ldo_lim,
- NULL, da9063_ldo_lim_event,
- IRQF_TRIGGER_LOW | IRQF_ONESHOT,
- "LDO_LIM", regulators);
- if (ret) {
- dev_err(&pdev->dev,
- "Failed to request LDO_LIM IRQ.\n");
- regulators->irq_ldo_lim = -ENXIO;
- }
+ ret = request_threaded_irq(irq,
+ NULL, da9063_ldo_lim_event,
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ "LDO_LIM", regulators);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to request LDO_LIM IRQ.\n");
+ regulators->irq_ldo_lim = -ENXIO;
}
return 0;