Skip to content

Commit a7ed3c2

Browse files
Liu YingpH5
authored andcommitted
drm/imx: ipuv3-crtc: Return error if ipu_plane_init() fails for primary plane
For primary plane initialization failure cases, ipu_plane_init() may return a pointer encoded by ERR_PTR(). So, we should bailout instead of using that pointer blindly. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 parent 4389559 commit a7ed3c2

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/gpu/drm/imx/ipuv3-crtc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,10 @@ static int ipu_crtc_init(struct ipu_crtc *ipu_crtc,
361361
dp = IPU_DP_FLOW_SYNC_BG;
362362
ipu_crtc->plane[0] = ipu_plane_init(drm, ipu, pdata->dma[0], dp, 0,
363363
DRM_PLANE_TYPE_PRIMARY);
364+
if (IS_ERR(ipu_crtc->plane[0])) {
365+
ret = PTR_ERR(ipu_crtc->plane[0]);
366+
goto err_put_resources;
367+
}
364368

365369
ret = imx_drm_add_crtc(drm, &ipu_crtc->base, &ipu_crtc->imx_crtc,
366370
&ipu_crtc->plane[0]->base, &ipu_crtc_helper_funcs,

0 commit comments

Comments
 (0)