diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:22:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:22:57 +0100 |
| commit | 170b649e40c0dac86eba6bd446fc79dd3b38c7ea (patch) | |
| tree | 8854bdb0d2cff87d8c1a6eeea69d4b25641cc07b /drivers/regulator | |
| parent | 75941a1ba32d36fe6230a6388f10c493b3f6232b (diff) | |
| parent | de4a54c4dfaed0604565c1b27488dce56997acc0 (diff) | |
| download | linux-170b649e40c0dac86eba6bd446fc79dd3b38c7ea.tar.bz2 | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 0cbfd3feccef..aa98f114cacf 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -808,8 +808,6 @@ static int suspend_set_state(struct regulator_dev *rdev, /* locks held by caller */ static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state) { - lockdep_assert_held_once(&rdev->mutex); - if (!rdev->constraints) return -EINVAL; @@ -1539,7 +1537,7 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } /* Cascade always-on state to supply */ - if (_regulator_is_enabled(rdev) && rdev->supply) { + if (_regulator_is_enabled(rdev)) { ret = regulator_enable(rdev->supply); if (ret < 0) { _regulator_put(rdev->supply); |