diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:32 +0100 |
| commit | 420118d48311e0c4ef4aace5aede35079ecc2412 (patch) | |
| tree | a4affbc11b9271d786b9c9e5711b1e7dc873d3e8 /drivers/regulator/anatop-regulator.c | |
| parent | 2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (diff) | |
| parent | 32dadef2190efd2e06331825b11881daf100d6d9 (diff) | |
| download | linux-0-day-420118d48311e0c4ef4aace5aede35079ecc2412.tar.gz linux-0-day-420118d48311e0c4ef4aace5aede35079ecc2412.tar.xz | |
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
Diffstat (limited to 'drivers/regulator/anatop-regulator.c')
| -rw-r--r-- | drivers/regulator/anatop-regulator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c index 0d4a8ccbb5361..e42bfd17562a3 100644 --- a/drivers/regulator/anatop-regulator.c +++ b/drivers/regulator/anatop-regulator.c @@ -200,7 +200,7 @@ static int anatop_regulator_probe(struct platform_device *pdev) config.regmap = sreg->anatop; /* register regulator */ - rdev = regulator_register(rdesc, &config); + rdev = devm_regulator_register(dev, rdesc, &config); if (IS_ERR(rdev)) { dev_err(dev, "failed to register %s\n", rdesc->name); @@ -223,7 +223,6 @@ static int anatop_regulator_remove(struct platform_device *pdev) struct anatop_regulator *sreg = rdev_get_drvdata(rdev); const char *name = sreg->name; - regulator_unregister(rdev); kfree(name); return 0; |