You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
pwm: mxs: Don't modify HW state in .probe() after the PWM chip was registered
commit020162d6f4upstream. This fixes a race condition: After pwmchip_add() is called there might already be a consumer and then modifying the hardware behind the consumer's back is bad. So reset before calling pwmchip_add(). Note that reseting the hardware isn't the right thing to do if the PWM is already running as it might e.g. disable (or even enable) a backlight that is supposed to be on (or off). Fixes:4dce82c1e8("pwm: add pwm-mxs support") Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
322b70b522
commit
777344da34
@@ -148,6 +148,11 @@ static int mxs_pwm_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* FIXME: Only do this if the PWM isn't already running */
|
||||
ret = stmp_reset_block(mxs->base);
|
||||
if (ret)
|
||||
return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
|
||||
|
||||
ret = pwmchip_add(&mxs->chip);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
|
||||
@@ -156,15 +161,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
|
||||
|
||||
platform_set_drvdata(pdev, mxs);
|
||||
|
||||
ret = stmp_reset_block(mxs->base);
|
||||
if (ret)
|
||||
goto pwm_remove;
|
||||
|
||||
return 0;
|
||||
|
||||
pwm_remove:
|
||||
pwmchip_remove(&mxs->chip);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int mxs_pwm_remove(struct platform_device *pdev)
|
||||
|
||||
Reference in New Issue
Block a user