Input: pwm-vibra - prevent unbalanced regulator (3ca232df) · Commits · 戴 / test

pwm_vibrator_stop disables the regulator, but it can be called from multiple places, even when the regulator is already disabled. Fix this by using regulator_is_enabled check when starting and stopping device. Signed-off-by:

Jonathan Bakker <xc-racer2@live.ca> Signed-off-by:

Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com> Signed-off-by:

Dmitry Torokhov <dmitry.torokhov@gmail.com>

drivers/input/misc/pwm-vibra.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ struct pwm_vibrator {
		struct work_struct play_work;
		u16 level;
		u32 direction_duty_cycle;
		bool vcc_on;
		};

		static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
		@@ -42,11 +43,14 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
		struct pwm_state state;
		int err;

		if (!vibrator->vcc_on) {
		err = regulator_enable(vibrator->vcc);
		if (err) {
		dev_err(pdev, "failed to enable regulator: %d", err);
		return err;
		}
		vibrator->vcc_on = true;
		}

		pwm_get_state(vibrator->pwm, &state);
		pwm_set_relative_duty_cycle(&state, vibrator->level, 0xffff);
		@@ -76,7 +80,10 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)

		static void pwm_vibrator_stop(struct pwm_vibrator *vibrator)
		{
		if (vibrator->vcc_on) {
		regulator_disable(vibrator->vcc);
		vibrator->vcc_on = false;
		}

		if (vibrator->pwm_dir)
		pwm_disable(vibrator->pwm_dir);

Admin message