From: Liu Ying <victor.liu@nxp.com>
Date: Thu, 12 Sep 2019 06:24:56 +0000 (+0800)
Subject: MLK-22600-2 drm/imx: dpu: plane: Improve bailout path of dpu_plane_init()
X-Git-Tag: rel_imx_4.19.35_1.1.0~45
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=2cbac623b9b75fc627f044564496b1514f44bff5;p=linux.git

MLK-22600-2 drm/imx: dpu: plane: Improve bailout path of dpu_plane_init()

This patch improves bailout path of dpu_plane_init().
As we'll add more drm properties to the planes later,
this would simply the code.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit 1a6ab9246b5d6e71e8a4a0a0b5ea15d7af0c9879)
---

diff --git a/drivers/gpu/drm/imx/dpu/dpu-plane.c b/drivers/gpu/drm/imx/dpu/dpu-plane.c
index e26b8bc65a97..c07ea060dce6 100644
--- a/drivers/gpu/drm/imx/dpu/dpu-plane.c
+++ b/drivers/gpu/drm/imx/dpu/dpu-plane.c
@@ -881,10 +881,8 @@ struct dpu_plane *dpu_plane_init(struct drm_device *drm,
 					       ARRAY_SIZE(dpu_overlay_formats),
 					       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);
 
@@ -902,10 +900,12 @@ struct dpu_plane *dpu_plane_init(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);
 }