| Message ID | 20240517143643.1.I0a6836fffd8d7620f353becb3df2370d2898f803@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/panel: Some very minor err handling fixes + more _multi | expand |
On Fri, May 17, 2024 at 02:36:36PM -0700, Douglas Anderson wrote: > If mipi_dsi_dcs_set_display_on() returned an error then we'd store > that in the "ret" variable and jump to error handling. We'd then > attempt an orderly poweroff. Unfortunately we then blew away the value > stored in "ret". That means that if the orderly poweroff actually > worked then we're return 0 (no error) from hx8394_enable() even though > the panel wasn't enabled. > > Fix this by not blowing away "ret". > > Found by code inspection. > > Fixes: 65dc9360f741 ("drm: panel: Add Himax HX8394 panel controller driver") > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
diff --git a/drivers/gpu/drm/panel/panel-himax-hx8394.c b/drivers/gpu/drm/panel/panel-himax-hx8394.c index ff0dc08b9829..cb9f46e853de 100644 --- a/drivers/gpu/drm/panel/panel-himax-hx8394.c +++ b/drivers/gpu/drm/panel/panel-himax-hx8394.c @@ -370,8 +370,7 @@ static int hx8394_enable(struct drm_panel *panel) sleep_in: /* This will probably fail, but let's try orderly power off anyway. */ - ret = mipi_dsi_dcs_enter_sleep_mode(dsi); - if (!ret) + if (!mipi_dsi_dcs_enter_sleep_mode(dsi)) msleep(50); return ret;
If mipi_dsi_dcs_set_display_on() returned an error then we'd store that in the "ret" variable and jump to error handling. We'd then attempt an orderly poweroff. Unfortunately we then blew away the value stored in "ret". That means that if the orderly poweroff actually worked then we're return 0 (no error) from hx8394_enable() even though the panel wasn't enabled. Fix this by not blowing away "ret". Found by code inspection. Fixes: 65dc9360f741 ("drm: panel: Add Himax HX8394 panel controller driver") Signed-off-by: Douglas Anderson <dianders@chromium.org> --- drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)