pwm: rcar: Fix late Runtime PM enablement
[ Upstream commit5.4-rM2-2.2.x-imx-squashed1451a3eed2
] Runtime PM should be enabled before calling pwmchip_add(), as PWM users can appear immediately after the PWM chip has been added. Likewise, Runtime PM should be disabled after the removal of the PWM chip. Fixes:ed6c1476bf
("pwm: Add support for R-Car PWM Timer") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
parent
b71ac8086a
commit
a5f036adae
|
@ -228,24 +228,28 @@ static int rcar_pwm_probe(struct platform_device *pdev)
|
||||||
rcar_pwm->chip.base = -1;
|
rcar_pwm->chip.base = -1;
|
||||||
rcar_pwm->chip.npwm = 1;
|
rcar_pwm->chip.npwm = 1;
|
||||||
|
|
||||||
|
pm_runtime_enable(&pdev->dev);
|
||||||
|
|
||||||
ret = pwmchip_add(&rcar_pwm->chip);
|
ret = pwmchip_add(&rcar_pwm->chip);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(&pdev->dev, "failed to register PWM chip: %d\n", ret);
|
dev_err(&pdev->dev, "failed to register PWM chip: %d\n", ret);
|
||||||
|
pm_runtime_disable(&pdev->dev);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
pm_runtime_enable(&pdev->dev);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rcar_pwm_remove(struct platform_device *pdev)
|
static int rcar_pwm_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
|
struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = pwmchip_remove(&rcar_pwm->chip);
|
||||||
|
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
|
||||||
return pwmchip_remove(&rcar_pwm->chip);
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id rcar_pwm_of_table[] = {
|
static const struct of_device_id rcar_pwm_of_table[] = {
|
||||||
|
|
Loading…
Reference in New Issue