Commit 170b649e authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 75941a1b de4a54c4

MAINTAINERS

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

drivers/regulator/core.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -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);

include/linux/regulator/driver.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;