Commit 1451a3ee authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Thierry Reding
Browse files

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: ed6c1476 ("pwm: Add support for R-Car PWM Timer")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 5928ce02
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -229,24 +229,28 @@ static int rcar_pwm_probe(struct platform_device *pdev)
	rcar_pwm->chip.base = -1;
	rcar_pwm->chip.npwm = 1;

	pm_runtime_enable(&pdev->dev);

	ret = pwmchip_add(&rcar_pwm->chip);
	if (ret < 0) {
		dev_err(&pdev->dev, "failed to register PWM chip: %d\n", ret);
		pm_runtime_disable(&pdev->dev);
		return ret;
	}

	pm_runtime_enable(&pdev->dev);

	return 0;
}

static int rcar_pwm_remove(struct platform_device *pdev)
{
	struct rcar_pwm_chip *rcar_pwm = platform_get_drvdata(pdev);
	int ret;

	ret = pwmchip_remove(&rcar_pwm->chip);

	pm_runtime_disable(&pdev->dev);

	return pwmchip_remove(&rcar_pwm->chip);
	return ret;
}

static const struct of_device_id rcar_pwm_of_table[] = {