media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()'

BugLink: https://bugs.launchpad.net/bugs/1959376
[ Upstream commit 8cc7a1b2aca067397a016cdb971a5e6ad9b640c7 ]

A successful 'of_platform_populate()' call should be balanced by a
corresponding 'of_platform_depopulate()' call in the error handling path
of the probe, as already done in the remove function.

A successful 'venus_firmware_init()' call should be balanced by a
corresponding 'venus_firmware_deinit()' call in the error handling path
of the probe, as already done in the remove function.

Update the error handling path accordingly.

Fixes: f9799fcce4bb ("media: venus: firmware: register separate platform_device for firmware loader")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 84cd92628cfdcbd65c533c02d13f87f13842981f..1f0181b6353c9b4fb7f9d92bc836ec9a941126e5 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -349,11 +349,11 @@ static int venus_probe(struct platform_device *pdev)
 
        ret = venus_firmware_init(core);
        if (ret)
-               goto err_runtime_disable;
+               goto err_of_depopulate;
 
        ret = venus_boot(core);
        if (ret)
-               goto err_runtime_disable;
+               goto err_firmware_deinit;
 
        ret = hfi_core_resume(core, true);
        if (ret)
@@ -385,6 +385,10 @@ err_dev_unregister:
        v4l2_device_unregister(&core->v4l2_dev);
 err_venus_shutdown:
        venus_shutdown(core);
+err_firmware_deinit:
+       venus_firmware_deinit(core);
+err_of_depopulate:
+       of_platform_depopulate(dev);
 err_runtime_disable:
        pm_runtime_put_noidle(dev);
        pm_runtime_set_suspended(dev);