Commit aea24171 authored Jul 30, 2018 by Sean Paul Committed by Rob Clark Oct 03, 2018

drm/msm: dsi: Initialize msm_dsi->id to -1



Currently msm_dsi->id is initialized to 0 during kzalloc. If bind fails
for a secondary dsi device before its id can be properly set (such as
during dt parsing), the id will point to the primary dsi device, causing
its reference to be removed from dsi_manager's global (msm_dsim_glb)
array.

This patch initializes the id to -1 and checks for negative in the
manager cleanup.

Cc: Doug Anderson <dianders@chromium.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

Signed-off-by: Rob Clark <robdclark@gmail.com>

parent 87c2ee74

drivers/gpu/drm/msm/dsi/dsi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ static struct msm_dsi dsi_init(struct platform_device pdev)
		return ERR_PTR(-ENOMEM);
		DBG("dsi probed=%p", msm_dsi);

		msm_dsi->id = -1;
		msm_dsi->pdev = pdev;
		platform_set_drvdata(pdev, msm_dsi);

drivers/gpu/drm/msm/dsi/dsi_manager.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -839,6 +839,8 @@ void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi)

		if (msm_dsi->host)
		msm_dsi_host_unregister(msm_dsi->host);

		if (msm_dsi->id >= 0)
		msm_dsim->dsi[msm_dsi->id] = NULL;
		}

Admin message