Skip to content

Commit a6c40b8

Browse files
committed
drm/mcde: Fix unbalanced regulator
Since we now turn off the EPOD regulator to reset the hardware, we need to balance the regulators after that point. If registering the master fails we only need to disable one regulator. Fix this by open-coding this leg of the error path. Fixes: c4842d4 ("drm/mcde: Fix display pipeline restart") Signed-off-by: Linus Walleij <[email protected]> Reviewed-by: Sam Ravnborg <[email protected]> Cc: Stephan Gerhold <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 06ad8d3 commit a6c40b8

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/gpu/drm/mcde/mcde_drv.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,13 @@ static int mcde_probe(struct platform_device *pdev)
413413
match);
414414
if (ret) {
415415
dev_err(dev, "failed to add component master\n");
416-
goto clk_disable;
416+
/*
417+
* The EPOD regulator is already disabled at this point so some
418+
* special errorpath code is needed
419+
*/
420+
clk_disable_unprepare(mcde->mcde_clk);
421+
regulator_disable(mcde->vana);
422+
return ret;
417423
}
418424

419425
return 0;

0 commit comments

Comments
 (0)