drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()

Dan Carpenter · robclark · commit 739b4e7756d3 · 2021-10-11T17:30:53.000-07:00
Return an error code if msm_dsi_manager_validate_current_config(). Don't return success. Fixes: 8b03ad3 ("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>
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -215,8 +215,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;
 

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,10 @@ int msm_dsi_modeset_init(struct msm_dsi msm_dsi, struct drm_device dev,`
`215`	`215`	`goto fail;`
`216`	`216`	`}`
`217`	`217`
`218`		`- if (!msm_dsi_manager_validate_current_config(msm_dsi->id))`
	`218`	`+ if (!msm_dsi_manager_validate_current_config(msm_dsi->id)) {`
	`219`	`+ ret = -EINVAL;`
`219`	`220`	`goto fail;`
	`221`	`+ }`
`220`	`222`
`221`	`223`	`msm_dsi->encoder = encoder;`
`222`	`224`