regulator: Actually free the regulator in devm_regulator_put()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 7 May 2012 10:34:52 +0000 (11:34 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 7 May 2012 12:14:44 +0000 (13:14 +0100)
It turns out that (quite surprisingly) devres_destroy() only undoes the
devres mapping, it doesn't destroy the underlying resource, meaning that
anything using devm_regulator_put() would leak. While we wait for the new
devres_release() which does what we want to get merged open code it in
devm_regulator_put().

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
drivers/regulator/core.c

index e70dd382a009a2db05d78087b6e0e588584e6b6e..046fb1bd86199c46561774a8a2bbd2a6118a52fc 100644 (file)
@@ -1431,7 +1431,10 @@ void devm_regulator_put(struct regulator *regulator)
 
        rc = devres_destroy(regulator->dev, devm_regulator_release,
                            devm_regulator_match, regulator);
-       WARN_ON(rc);
+       if (rc == 0)
+               regulator_put(regulator);
+       else
+               WARN_ON(rc);
 }
 EXPORT_SYMBOL_GPL(devm_regulator_put);