Skip to content

Commit 1451a3e

Browse files
geertuthierryreding
authored andcommitted
pwm: rcar: Fix late Runtime PM enablement
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: ed6c147 ("pwm: Add support for R-Car PWM Timer") Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Uwe Kleine-König <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 5928ce0 commit 1451a3e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/pwm/pwm-rcar.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,24 +229,28 @@ static int rcar_pwm_probe(struct platform_device *pdev)
229229
rcar_pwm->chip.base = -1;
230230
rcar_pwm->chip.npwm = 1;
231231

232+
pm_runtime_enable(&pdev->dev);
233+
232234
ret = pwmchip_add(&rcar_pwm->chip);
233235
if (ret < 0) {
234236
dev_err(&pdev->dev, "failed to register PWM chip: %d\n", ret);
237+
pm_runtime_disable(&pdev->dev);
235238
return ret;
236239
}
237240

238-
pm_runtime_enable(&pdev->dev);
239-
240241
return 0;
241242
}
242243

243244
static int rcar_pwm_remove(struct platform_device *pdev)
244245
{
245246
struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
247+
int ret;
248+
249+
ret = pwmchip_remove(&rcar_pwm->chip);
246250

247251
pm_runtime_disable(&pdev->dev);
248252

249-
return pwmchip_remove(&rcar_pwm->chip);
253+
return ret;
250254
}
251255

252256
static const struct of_device_id rcar_pwm_of_table[] = {

0 commit comments

Comments
 (0)