diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 14:11:32 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 14:11:32 +0400 |
| commit | 420118d48311e0c4ef4aace5aede35079ecc2412 (patch) | |
| tree | a4affbc11b9271d786b9c9e5711b1e7dc873d3e8 /drivers/regulator/wm8350-regulator.c | |
| parent | 2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (diff) | |
| parent | 32dadef2190efd2e06331825b11881daf100d6d9 (diff) | |
| download | linux-420118d48311e0c4ef4aace5aede35079ecc2412.tar.xz | |
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
Diffstat (limited to 'drivers/regulator/wm8350-regulator.c')
| -rw-r--r-- | drivers/regulator/wm8350-regulator.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 61ca9292a429..017e8695ca71 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c @@ -1206,7 +1206,8 @@ static int wm8350_regulator_probe(struct platform_device *pdev) config.regmap = wm8350->regmap; /* register regulator */ - rdev = regulator_register(&wm8350_reg[pdev->id], &config); + rdev = devm_regulator_register(&pdev->dev, &wm8350_reg[pdev->id], + &config); if (IS_ERR(rdev)) { dev_err(&pdev->dev, "failed to register %s\n", wm8350_reg[pdev->id].name); @@ -1217,7 +1218,6 @@ static int wm8350_regulator_probe(struct platform_device *pdev) ret = wm8350_register_irq(wm8350, wm8350_reg[pdev->id].irq, pmic_uv_handler, 0, "UV", rdev); if (ret < 0) { - regulator_unregister(rdev); dev_err(&pdev->dev, "failed to register regulator %s IRQ\n", wm8350_reg[pdev->id].name); return ret; @@ -1233,8 +1233,6 @@ static int wm8350_regulator_remove(struct platform_device *pdev) wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq, rdev); - regulator_unregister(rdev); - return 0; } |