summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-10-01 15:33:08 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-20 11:45:05 +0200
commit2c5658717428ae4f7c0ef8706b45f0d00821d744 (patch)
tree929399af75865945edb39945234c27cd5187b328
parentb28586fb04f35a2d07ebe62e702525139bb2ce3d (diff)
downloadlinux-stable-2c5658717428ae4f7c0ef8706b45f0d00821d744.tar.gz
linux-stable-2c5658717428ae4f7c0ef8706b45f0d00821d744.tar.bz2
linux-stable-2c5658717428ae4f7c0ef8706b45f0d00821d744.zip
drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()
commit 739b4e7756d3301dd673ca517afca46a5f635562 upstream. Return an error code if msm_dsi_manager_validate_current_config(). Don't return success. Fixes: 8b03ad30e314 ("drm/msm/dsi: Use one connector for dual DSI mode") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20211001123308.GF2283@kili Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Rob Clark <robdclark@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/msm/dsi/dsi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index 7e364b9c9f9e..1adead764fee 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -208,8 +208,10 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
goto fail;
}
- if (!msm_dsi_manager_validate_current_config(msm_dsi->id))
+ if (!msm_dsi_manager_validate_current_config(msm_dsi->id)) {
+ ret = -EINVAL;
goto fail;
+ }
msm_dsi->encoder = encoder;