From 97398695df29b589ad18be49ecfb59bb62d6a2e1 Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Thu, 14 Nov 2019 10:42:30 +0800 Subject: [PATCH] drm/imx: dpu: plane: Improve bailout path of dpu_plane_create() This patch improves bailout path of dpu_plane_create(). As we'll add more drm properties to the planes later, this would simply the code. Signed-off-by: Liu Ying --- drivers/gpu/drm/imx/dpu/dpu-plane.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/imx/dpu/dpu-plane.c b/drivers/gpu/drm/imx/dpu/dpu-plane.c index 1ac7d4251e35..5894f7d64402 100644 --- a/drivers/gpu/drm/imx/dpu/dpu-plane.c +++ b/drivers/gpu/drm/imx/dpu/dpu-plane.c @@ -970,17 +970,15 @@ struct dpu_plane *dpu_plane_create(struct drm_device *drm, format_count = ARRAY_SIZE(dpu_overlay_formats); break; default: - kfree(dpu_plane); - return ERR_PTR(-EINVAL); + ret = -EINVAL; + goto err; } ret = drm_universal_plane_init(drm, plane, possible_crtcs, &dpu_plane_funcs, formats, format_count, dpu_format_modifiers, type, NULL); - if (ret) { - kfree(dpu_plane); - return ERR_PTR(ret); - } + if (ret) + goto err; drm_plane_helper_add(plane, &dpu_plane_helper_funcs); @@ -998,10 +996,12 @@ struct dpu_plane *dpu_plane_create(struct drm_device *drm, ret = -EINVAL; } - if (ret) { - kfree(dpu_plane); - return ERR_PTR(ret); - } + if (ret) + goto err; return dpu_plane; + +err: + kfree(dpu_plane); + return ERR_PTR(ret); }