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.

Signed-off-by: Heiko Stuebner <he...@sntech.de>
---
 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c 
b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
index 28cd7560e5db..d7a17dca2a9c 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
@@ -1292,7 +1292,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);
@@ -1304,18 +1304,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)
-- 
2.47.2

Reply via email to