Commit d73b5a99 authored Jan 19, 2021 by Simon South Committed by Greg Kroah-Hartman Mar 04, 2021

pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare()



[ Upstream commit d5d8d675865ccddfe4da26c85f22c55cec663bf2 ]

If rockchip_pwm_probe() fails to register a PWM device it calls
clk_unprepare() for the device's PWM clock, without having first disabled
the clock and before jumping to an error handler that also unprepares
it. This is likely to produce warnings from the kernel about the clock
being unprepared when it is still enabled, and then being unprepared when
it has already been unprepared.

Prevent these warnings by removing this unnecessary call to
clk_unprepare().

Fixes: 48cf973c ("pwm: rockchip: Avoid glitches on already running PWMs")
Signed-off-by: Simon South <simon@simonsouth.net>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d786e3e7

drivers/pwm/pwm-rockchip.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -370,7 +370,6 @@ static int rockchip_pwm_probe(struct platform_device *pdev)

	ret = pwmchip_add(&pc->chip);		ret = pwmchip_add(&pc->chip);
	if (ret < 0) {		if (ret < 0) {
	clk_unprepare(pc->clk);
	dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);		dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
	goto err_pclk;		goto err_pclk;
	}		}