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 | |
| parent | 75941a1ba32d36fe6230a6388f10c493b3f6232b (diff) | |
| parent | de4a54c4dfaed0604565c1b27488dce56997acc0 (diff) | |
| download | linux-170b649e40c0dac86eba6bd446fc79dd3b38c7ea.tar.bz2 | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/regulator/core.c | 4 | ||||
| -rw-r--r-- | include/linux/regulator/driver.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a727d9959ecd..fce0ba53ec82 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11997,7 +11997,9 @@ L: linux-kernel@vger.kernel.org W: http://www.slimlogic.co.uk/?p=48 T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git S: Supported +F: Documentation/devicetree/bindings/regulator/ F: drivers/regulator/ +F: include/dt-bindings/regulator/ F: include/linux/regulator/ VRF 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); diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index cd271e89a7e6..9ac3f9879576 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -292,7 +292,7 @@ struct regulator_desc { const struct regulator_desc *, struct regulator_config *); int id; - bool continuous_voltage_range; + unsigned int continuous_voltage_range:1; unsigned n_voltages; const struct regulator_ops *ops; int irq; |