]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/panel: ilitek-ili9881c: turn off power-supply when init fails
authorHeiko Stuebner <heiko@sntech.de>
Mon, 7 Jul 2025 16:48:54 +0000 (18:48 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 22 Aug 2025 21:00:02 +0000 (23:00 +0200)
The prepare function turns on the power-supply regulator first, when
preparing the display. But in an error case, just returns the error
code, but does not power off the regulator again, fix that.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250707164906.1445288-2-heiko@sntech.de
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c

index ac433345a1794baa07de8b164d6ac25d4ee4b7ab..3af22a5f5700cc40a9a49dfab18e6c8010fca605 100644 (file)
@@ -1486,7 +1486,7 @@ static int ili9881c_prepare(struct drm_panel *panel)
                                                      instr->arg.cmd.data);
 
                if (ret)
-                       return ret;
+                       goto disable_power;
        }
 
        ret = ili9881c_switch_page(ctx, 0);
@@ -1498,18 +1498,22 @@ static int ili9881c_prepare(struct drm_panel *panel)
                                         &ctx->address_mode,
                                         sizeof(ctx->address_mode));
                if (ret < 0)
-                       return ret;
+                       goto disable_power;
        }
 
        ret = mipi_dsi_dcs_set_tear_on(ctx->dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
        if (ret)
-               return ret;
+               goto disable_power;
 
        ret = mipi_dsi_dcs_exit_sleep_mode(ctx->dsi);
        if (ret)
-               return ret;
+               goto disable_power;
 
        return 0;
+
+disable_power:
+       regulator_disable(ctx->power);
+       return ret;
 }
 
 static int ili9881c_enable(struct drm_panel *panel)