Skip to content

Commit

Permalink
drm: omapdrm: displays: panel-dsi-cm: Fix field access before set
Browse files Browse the repository at this point in the history
The driver accesses the ddata->in field before it gets set in the
dsicm_connect() function. Use the local in pointer variable instead.

Fixes: 7877632b4cd0 ("drm: omapdrm: displays: Get panel source at connect time")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Laurent Pinchart authored and Tomi Valkeinen committed Mar 2, 2018
1 parent 4cba707 commit c39bbb9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
Original file line number Diff line number Diff line change
Expand Up @@ -778,13 +778,13 @@ static int dsicm_connect(struct omap_dss_device *dssdev)
goto err_connect;
}

r = in->ops.dsi->request_vc(ddata->in, &ddata->channel);
r = in->ops.dsi->request_vc(in, &ddata->channel);
if (r) {
dev_err(dev, "failed to get virtual channel\n");
goto err_req_vc;
}

r = in->ops.dsi->set_vc_id(ddata->in, ddata->channel, TCH);
r = in->ops.dsi->set_vc_id(in, ddata->channel, TCH);
if (r) {
dev_err(dev, "failed to set VC_ID\n");
goto err_vc_id;
Expand All @@ -794,7 +794,7 @@ static int dsicm_connect(struct omap_dss_device *dssdev)
return 0;

err_vc_id:
in->ops.dsi->release_vc(ddata->in, ddata->channel);
in->ops.dsi->release_vc(in, ddata->channel);
err_req_vc:
in->ops.dsi->disconnect(in, dssdev);
err_connect:
Expand Down

0 comments on commit c39bbb9

Please sign in to comment.