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

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
...@@ -196,7 +196,7 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, ...@@ -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,19 +245,17 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, ...@@ -245,19 +245,17 @@ 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); msm_dsi->bridge = NULL;
msm_dsi->bridge = NULL; }
}
/* don't destroy connector if we didn't make it */ /* don't destroy connector if we didn't make it */
if (msm_dsi->connector && !msm_dsi->external_bridge) if (msm_dsi->connector && !msm_dsi->external_bridge)
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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment