drm/hisilicon/hibmc: fix the i2c device resource leak when vdac init failed

[ Upstream commit e5f48bfa2ae0806d5f51fb8061afc619a73599a7 ]

Currently the driver missed to clean the i2c adapter when vdac init failed.
It may cause resource leak.

Fixes: a0d078d06e516 ("drm/hisilicon: Features to support reading resolutions from EDID")
Signed-off-by: Baihan Li <libaihan@huawei.com>
Signed-off-by: Yongbang Shi <shiyongbang@huawei.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250813094238.3722345-2-shiyongbang@huawei.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
index 42f0ab8f9b5a4de900de77978e0d059936a0c637..6eb0d41a0f688aab425c051ef78e94a18d5b26de 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
@@ -58,5 +58,6 @@ int hibmc_de_init(struct hibmc_drm_private *priv);
 int hibmc_vdac_init(struct hibmc_drm_private *priv);
 
 int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *connector);
+void hibmc_ddc_del(struct hibmc_vdac *vdac);
 
 #endif

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
index 99b3b77b5445f6a5a6f8cd2e8a3efb5eaa709bf2..44860011855eb696ee0f9a357d3b4c0ec903c054 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
@@ -95,3 +95,8 @@ int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *vdac)
 
        return i2c_bit_add_bus(&vdac->adapter);
 }
+
+void hibmc_ddc_del(struct hibmc_vdac *vdac)
+{
+       i2c_del_adapter(&vdac->adapter);
+}

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
index 05e19ea4c9f9edf02925712d65d138e1c2e813e7..9e29386700c87e6c9026811a6523a00d692459b8 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
@@ -53,7 +53,7 @@ static void hibmc_connector_destroy(struct drm_connector *connector)
 {
        struct hibmc_vdac *vdac = to_hibmc_vdac(connector);
 
-       i2c_del_adapter(&vdac->adapter);
+       hibmc_ddc_del(vdac);
        drm_connector_cleanup(connector);
 }
 
@@ -109,7 +109,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
        ret = drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_DAC, NULL);
        if (ret) {
                drm_err(dev, "failed to init encoder: %d\n", ret);
-               return ret;
+               goto err;
        }
 
        drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);
@@ -120,7 +120,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
                                          &vdac->adapter);
        if (ret) {
                drm_err(dev, "failed to init connector: %d\n", ret);
-               return ret;
+               goto err;
        }
 
        drm_connector_helper_add(connector, &hibmc_connector_helper_funcs);
@@ -128,4 +128,9 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
        drm_connector_attach_encoder(connector, encoder);
 
        return 0;
+
+err:
+       hibmc_ddc_del(vdac);
+
+       return ret;
 }