Commit 9398a10c authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "Two driver fixes, one fixing the mapping of interrupts on da9055
  (which previously wouldn't have worked at all) and a fix for reference
  counting OF nodes in the max14577 driver"

* tag 'regulator-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: da9055: Remove use of regmap_irq_get_virq()
  regulator: max14577: Add missing of_node_put
parents dea054fc 5c306c8a
...@@ -576,7 +576,9 @@ static int da9055_regulator_probe(struct platform_device *pdev) ...@@ -576,7 +576,9 @@ static int da9055_regulator_probe(struct platform_device *pdev)
/* Only LDO 5 and 6 has got the over current interrupt */ /* Only LDO 5 and 6 has got the over current interrupt */
if (pdev->id == DA9055_ID_LDO5 || pdev->id == DA9055_ID_LDO6) { if (pdev->id == DA9055_ID_LDO5 || pdev->id == DA9055_ID_LDO6) {
irq = platform_get_irq_byname(pdev, "REGULATOR"); irq = platform_get_irq_byname(pdev, "REGULATOR");
irq = regmap_irq_get_virq(da9055->irq_data, irq); if (irq < 0)
return irq;
ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
da9055_ldo5_6_oc_irq, da9055_ldo5_6_oc_irq,
IRQF_TRIGGER_HIGH | IRQF_TRIGGER_HIGH |
......
...@@ -168,10 +168,11 @@ static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev) ...@@ -168,10 +168,11 @@ static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev)
MAX14577_REG_MAX); MAX14577_REG_MAX);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret); dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);
return ret;
} }
return 0; of_node_put(np);
return ret;
} }
static inline struct regulator_init_data *match_init_data(int index) static inline struct regulator_init_data *match_init_data(int index)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment