Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ed3c2b authored by Liu Ying's avatar Liu Ying Committed by Philipp Zabel
Browse files

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: default avatarLiu Ying <Ying.Liu@freescale.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 43895599

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

+4 −0
Original line number Diff line number Diff line
@@ -361,6 +361,10 @@ static int ipu_crtc_init(struct ipu_crtc *ipu_crtc, 
		dp = IPU_DP_FLOW_SYNC_BG;

	ipu_crtc->plane[0] = ipu_plane_init(drm, ipu, pdata->dma[0], dp, 0,

					    DRM_PLANE_TYPE_PRIMARY);

	if (IS_ERR(ipu_crtc->plane[0])) {

		ret = PTR_ERR(ipu_crtc->plane[0]);

		goto err_put_resources;

	}



	ret = imx_drm_add_crtc(drm, &ipu_crtc->base, &ipu_crtc->imx_crtc,

			&ipu_crtc->plane[0]->base, &ipu_crtc_helper_funcs,