aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2018-01-17 16:55:27 -0500
committerLiviu Dudau <Liviu.Dudau@arm.com>2018-07-31 11:31:50 -0400
commit8df24d57d34cd229e7094cfd1b927b585585202d (patch)
tree795415527b0f78b2353827329343b0ca9c06a124
parent1785dbc412c257879274e8807afd6dfdfe06c47b (diff)
drm: arm: hdlcd: Don't destroy plane manually in hdlcd_setup_crtc()
The top-level error handler calls drm_mode_config_cleanup() which will destroy all planes. There's no need to destroy them manually in lower error handlers. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
-rw-r--r--drivers/gpu/drm/arm/hdlcd_crtc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
index f3f08cd6e9ef..c36c75bef6d9 100644
--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -334,10 +334,8 @@ int hdlcd_setup_crtc(struct drm_device *drm)
334 334
335 ret = drm_crtc_init_with_planes(drm, &hdlcd->crtc, primary, NULL, 335 ret = drm_crtc_init_with_planes(drm, &hdlcd->crtc, primary, NULL,
336 &hdlcd_crtc_funcs, NULL); 336 &hdlcd_crtc_funcs, NULL);
337 if (ret) { 337 if (ret)
338 hdlcd_plane_destroy(primary);
339 return ret; 338 return ret;
340 }
341 339
342 drm_crtc_helper_add(&hdlcd->crtc, &hdlcd_crtc_helper_funcs); 340 drm_crtc_helper_add(&hdlcd->crtc, &hdlcd_crtc_helper_funcs);
343 return 0; 341 return 0;