diff options
| -rw-r--r-- | drivers/regulator/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index de9f272a0faf..7150ff6ef46b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -1422,11 +1422,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) | |||
| 1422 | return ret; | 1422 | return ret; |
| 1423 | 1423 | ||
| 1424 | /* Cascade always-on state to supply */ | 1424 | /* Cascade always-on state to supply */ |
| 1425 | if (_regulator_is_enabled(rdev)) { | 1425 | if (_regulator_is_enabled(rdev) && rdev->supply) { |
| 1426 | ret = regulator_enable(rdev->supply); | 1426 | ret = regulator_enable(rdev->supply); |
| 1427 | if (ret < 0) { | 1427 | if (ret < 0) { |
| 1428 | if (rdev->supply) | 1428 | _regulator_put(rdev->supply); |
| 1429 | _regulator_put(rdev->supply); | ||
| 1430 | return ret; | 1429 | return ret; |
| 1431 | } | 1430 | } |
| 1432 | } | 1431 | } |
