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

Commit 97c36deb authored by Navid Emamdoost's avatar Navid Emamdoost Committed by Greg Kroah-Hartman
Browse files

pwm: img: Call pm_runtime_put() in pm_runtime_get_sync() failed case 



[ Upstream commit ca162ce98110b98e7d97b7157328d34dcfdd40a9 ]

Even in failed case of pm_runtime_get_sync(), the usage_count is
incremented. In order to keep the usage_count with correct value call
appropriate pm_runtime_put().

Signed-off-by: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 78c131f6

drivers/pwm/pwm-img.c

+6 −2
Original line number Diff line number Diff line
@@ -132,8 +132,10 @@ static int img_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, 
	duty = DIV_ROUND_UP(timebase * duty_ns, period_ns);



	ret = pm_runtime_get_sync(chip->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put_autosuspend(chip->dev);

		return ret;

	}



	val = img_pwm_readl(pwm_chip, PWM_CTRL_CFG);

	val &= ~(PWM_CTRL_CFG_DIV_MASK << PWM_CTRL_CFG_DIV_SHIFT(pwm->hwpwm));
@@ -334,8 +336,10 @@ static int img_pwm_remove(struct platform_device *pdev) 
	int ret;



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0)

	if (ret < 0) {

		pm_runtime_put(&pdev->dev);

		return ret;

	}



	for (i = 0; i < pwm_chip->chip.npwm; i++) {

		val = img_pwm_readl(pwm_chip, PWM_CTRL_CFG);