mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
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>
This commit is contained in:
parent
f5164b8833
commit
9f8df6adf6
1 changed files with 2 additions and 3 deletions
|
@ -1422,11 +1422,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* Cascade always-on state to supply */
|
/* Cascade always-on state to supply */
|
||||||
if (_regulator_is_enabled(rdev)) {
|
if (_regulator_is_enabled(rdev) && rdev->supply) {
|
||||||
ret = regulator_enable(rdev->supply);
|
ret = regulator_enable(rdev->supply);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (rdev->supply)
|
_regulator_put(rdev->supply);
|
||||||
_regulator_put(rdev->supply);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue