Commit 3f0689e6 authored by Lloyd Atkinson's avatar Lloyd Atkinson Committed by Rob Clark
Browse files

drm/msm/dsi: check msm_dsi and dsi pointers before use 



Move null checks of pointer arguments to the beginning of the
modeset init function since they are referenced immediately
instead of after they have already been used.

Signed-off-by: default avatarLloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 6e1787cf

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

+10 −12
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, 
	struct drm_bridge *ext_bridge;

	struct drm_bridge *ext_bridge;

	int ret;

	int ret;





	if (WARN_ON(!encoder))

	if (WARN_ON(!encoder) || WARN_ON(!msm_dsi) || WARN_ON(!dev))

		return -EINVAL;

		return -EINVAL;





	msm_dsi->dev = dev;

	msm_dsi->dev = dev;
@@ -245,7 +245,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, 




	return 0;

	return 0;

fail:

fail:

	if (msm_dsi) {

	/* bridge/connector are normally destroyed by drm: */

	/* bridge/connector are normally destroyed by drm: */

	if (msm_dsi->bridge) {

	if (msm_dsi->bridge) {

		msm_dsi_manager_bridge_destroy(msm_dsi->bridge);

		msm_dsi_manager_bridge_destroy(msm_dsi->bridge);
@@ -257,7 +256,6 @@ fail: 
		msm_dsi->connector->funcs->destroy(msm_dsi->connector);

		msm_dsi->connector->funcs->destroy(msm_dsi->connector);





	msm_dsi->connector = NULL;

	msm_dsi->connector = NULL;

	}





	return ret;

	return ret;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE