drm/rockchip: cdn-dp: Fix some error handling paths in cdn_dp_probe()

[ Upstream commit 44b968d0d0868b7a9b7a5c64464ada464ff4d532 ]

cdn_dp_audio_codec_init() can fail. So add some error handling.

If component_add() fails, the previous cdn_dp_audio_codec_init() call
should be undone, as already done in the remove function.

Fixes: 88582f564692 ("drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/8494a41602fadb7439630921a9779640698f2f9f.1693676045.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index a29fbaf..3793863 100644 (file)
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1177,6 +1177,7 @@ static int cdn_dp_probe(struct platform_device *pdev)
        struct cdn_dp_device *dp;
        struct extcon_dev *extcon;
        struct phy *phy;
+       int ret;
        int i;
 
        dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
@@ -1217,9 +1218,19 @@ static int cdn_dp_probe(struct platform_device *pdev)
        mutex_init(&dp->lock);
        dev_set_drvdata(dev, dp);
 
-       cdn_dp_audio_codec_init(dp, dev);
+       ret = cdn_dp_audio_codec_init(dp, dev);
+       if (ret)
+               return ret;
+
+       ret = component_add(dev, &cdn_dp_component_ops);
+       if (ret)
+               goto err_audio_deinit;
 
-       return component_add(dev, &cdn_dp_component_ops);
+       return 0;
+
+err_audio_deinit:
+       platform_device_unregister(dp->audio_pdev);
+       return ret;
 }
 
 static void cdn_dp_remove(struct platform_device *pdev)