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

Commit 87248991 authored by Boris Brezillon's avatar Boris Brezillon Committed by Thierry Reding
Browse files

regulator: pwm: Properly initialize the ->state field 



The ->state field is currently initialized to 0, thus referencing the
voltage selector at index 0, which might not reflect the current
voltage value.
If possible, retrieve the current voltage selector from the PWM state,
else return -EINVAL.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 3f4eb39b

drivers/regulator/pwm-regulator.c

+22 −0
Original line number Diff line number Diff line
@@ -52,10 +52,31 @@ struct pwm_voltages { 
/**

 * Voltage table call-backs

 */

static void pwm_regulator_init_state(struct regulator_dev *rdev)

{

	struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);

	struct pwm_state pwm_state;

	unsigned int dutycycle;

	int i;



	pwm_get_state(drvdata->pwm, &pwm_state);

	dutycycle = pwm_get_relative_duty_cycle(&pwm_state, 100);



	for (i = 0; i < rdev->desc->n_voltages; i++) {

		if (dutycycle == drvdata->duty_cycle_table[i].dutycycle) {

			drvdata->state = i;

			return;

		}

	}

}



static int pwm_regulator_get_voltage_sel(struct regulator_dev *rdev)

{

	struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);



	if (drvdata->state < 0)

		pwm_regulator_init_state(rdev);



	return drvdata->state;

}
@@ -221,6 +242,7 @@ static int pwm_regulator_init_table(struct platform_device *pdev, 
		return ret;

	}



	drvdata->state			= -EINVAL;

	drvdata->duty_cycle_table	= duty_cycle_table;

	memcpy(&drvdata->ops, &pwm_regulator_voltage_table_ops,

	       sizeof(drvdata->ops));