diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index f720fd3fef13..544a51cfccb0 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1345,7 +1345,8 @@ static int vop_create_crtc(struct vop *vop)
 		    win->type != DRM_PLANE_TYPE_CURSOR)
 			continue;
 
-		if (vop_plane_init(vop, win, 0))
+		ret = vop_plane_init(vop, win, 0);
+		if (ret)
 			goto err_cleanup_planes;
 
 		plane = &win->base;
@@ -1374,7 +1375,8 @@ static int vop_create_crtc(struct vop *vop)
 		if (win->type != DRM_PLANE_TYPE_OVERLAY)
 			continue;
 
-		if (vop_plane_init(vop, win, possible_crtcs))
+		ret = vop_plane_init(vop, win, possible_crtcs);
+		if (ret)
 			goto err_cleanup_crtc;
 	}