[PATCH v2] [drm/meson] meson_plane: Add error handling v2(re-aligned)

[Haoran Liu]

This patch adds robust error handling to the meson_plane_create
function in drivers/gpu/drm/meson/meson_plane.c. The function
previously lacked proper handling for potential failure scenarios
of the drm_universal_plane_init call.

Signed-off-by: Haoran Liu <liuhaora...@163.com>
---
 drivers/gpu/drm/meson/meson_plane.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_plane.c 
b/drivers/gpu/drm/meson/meson_plane.c
index 815dfe30492b..b43ac61201f3 100644
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -534,6 +534,7 @@ int meson_plane_create(struct meson_drm *priv)
        struct meson_plane *meson_plane;
        struct drm_plane *plane;
        const uint64_t *format_modifiers = format_modifiers_default;
+       int ret;
 
        meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane),
                                   GFP_KERNEL);
@@ -548,12 +549,16 @@ int meson_plane_create(struct meson_drm *priv)
        else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
                format_modifiers = format_modifiers_afbc_g12a;
 
-       drm_universal_plane_init(priv->drm, plane, 0xFF,
-                                &meson_plane_funcs,
-                                supported_drm_formats,
-                                ARRAY_SIZE(supported_drm_formats),
-                                format_modifiers,
-                                DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane");
+       ret = drm_universal_plane_init(priv->drm, plane, 0xFF,
+                                       &meson_plane_funcs,
+                                       supported_drm_formats,
+                                       ARRAY_SIZE(supported_drm_formats),
+                                       format_modifiers,
+                                       DRM_PLANE_TYPE_PRIMARY, 
"meson_primary_plane");
+       if (ret) {
+               devm_kfree(priv->drm->dev, meson_plane);
+               return ret;
+       }
 
        drm_plane_helper_add(plane, &meson_plane_helper_funcs);
 
-- 
2.17.1