public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'regulator/topic/core' into regulator-next

Browse source
This commit is contained in:
Mark Brown 2016-05-13 14:22:57 +01:00
commit 170b649e40
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -11997,7 +11997,9 @@ L: linux-kernel@vger.kernel.org
W: http://www.slimlogic.co.uk/?p=48 W: http://www.slimlogic.co.uk/?p=48
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
S: Supported S: Supported
F: Documentation/devicetree/bindings/regulator/
F: drivers/regulator/ F: drivers/regulator/
F: include/dt-bindings/regulator/
F: include/linux/regulator/ F: include/linux/regulator/
VRF VRF

4
drivers/regulator/core.c
View file

@ -808,8 +808,6 @@ static int suspend_set_state(struct regulator_dev *rdev,
/* locks held by caller */ /* locks held by caller */
static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state) static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state)
{ {
lockdep_assert_held_once(&rdev->mutex);
if (!rdev->constraints) if (!rdev->constraints)
return -EINVAL; return -EINVAL;
@ -1539,7 +1537,7 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
} }
/* Cascade always-on state to supply */ /* Cascade always-on state to supply */
if (_regulator_is_enabled(rdev) && rdev->supply) { if (_regulator_is_enabled(rdev)) {
ret = regulator_enable(rdev->supply); ret = regulator_enable(rdev->supply);
if (ret < 0) { if (ret < 0) {
_regulator_put(rdev->supply); _regulator_put(rdev->supply);

2
include/linux/regulator/driver.h
View file

@ -292,7 +292,7 @@ struct regulator_desc {
const struct regulator_desc *, const struct regulator_desc *,
struct regulator_config *); struct regulator_config *);
int id; int id;
bool continuous_voltage_range; unsigned int continuous_voltage_range:1;
unsigned n_voltages; unsigned n_voltages;
const struct regulator_ops *ops; const struct regulator_ops *ops;
int irq; int irq;