Commit 9f8df6ad authored Sep 02, 2015 by Sudip Mukherjee Committed by Mark Brown Sep 02, 2015

regulator: core: fix possible NULL dereference



We were checking rdev->supply for NULL after dereferencing it. Lets
check for rdev->supply along with _regulator_is_enabled() and call
regulator_enable() only if rdev->supply is not NULL.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent f5164b88

drivers/regulator/core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1422,10 +1422,9 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
		return ret;

		/* Cascade always-on state to supply */
		if (_regulator_is_enabled(rdev)) {
		if (_regulator_is_enabled(rdev) && rdev->supply) {
		ret = regulator_enable(rdev->supply);
		if (ret < 0) {
		if (rdev->supply)
		_regulator_put(rdev->supply);
		return ret;
		}