Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ef6d2e0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

parents 6f7da290 2c2874b1

drivers/regulator/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2938,7 +2938,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, 
	if (rdev->supply &&

	    regulator_ops_is_valid(rdev->supply->rdev,

				   REGULATOR_CHANGE_VOLTAGE) &&

	    (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) {

	    (rdev->desc->min_dropout_uV || !(rdev->desc->ops->get_voltage ||

					   rdev->desc->ops->get_voltage_sel))) {

		int current_supply_uV;

		int selector;