Skip to content

Commit bc13d60

Browse files
shuijinglithierryreding
authored andcommitted
pwm: mtk_disp: Fix the disable flow of disp_pwm
There is a flow error in the original mtk_disp_pwm_apply() function. If this function is called when the clock is disabled, there will be a chance to operate the disp_pwm register, resulting in disp_pwm exception. Fix this accordingly. Fixes: 888a623 ("pwm: mtk-disp: Implement atomic API .apply()") Signed-off-by: Shuijing Li <shuijing.li@mediatek.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Tested-by: Fei Shao <fshao@chromium.org> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
1 parent 05b743d commit bc13d60

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

drivers/pwm/pwm-mtk-disp.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,11 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
7979
if (state->polarity != PWM_POLARITY_NORMAL)
8080
return -EINVAL;
8181

82-
if (!state->enabled) {
83-
mtk_disp_pwm_update_bits(mdp, DISP_PWM_EN, mdp->data->enable_mask,
84-
0x0);
85-
86-
if (mdp->enabled) {
87-
clk_disable_unprepare(mdp->clk_mm);
88-
clk_disable_unprepare(mdp->clk_main);
89-
}
82+
if (!state->enabled && mdp->enabled) {
83+
mtk_disp_pwm_update_bits(mdp, DISP_PWM_EN,
84+
mdp->data->enable_mask, 0x0);
85+
clk_disable_unprepare(mdp->clk_mm);
86+
clk_disable_unprepare(mdp->clk_main);
9087

9188
mdp->enabled = false;
9289
return 0;

0 commit comments

Comments
 (0)