Commit d1685e4e authored Oct 14, 2011 by Heiko Stübner Committed by Mark Brown Oct 14, 2011

regulator: Fix possible nullpointer dereference in regulator_enable()

In the case where _regulator_enable returns an error it was not checked
if a supplying regulator exists before trying to disable it, leading
to a null pointer-dereference if no supplying regulator existed.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent d162b3c5

drivers/regulator/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1425,7 +1425,7 @@ int regulator_enable(struct regulator *regulator)
		ret = _regulator_enable(rdev);
		mutex_unlock(&rdev->mutex);

		if (ret != 0)
		if (ret != 0 && rdev->supply)
		regulator_disable(rdev->supply);

		return ret;