Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04bb89f5 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

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



[ 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: f9799fcc ("media: venus: firmware: register separate platform_device for firmware loader")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8034d6c4

drivers/media/platform/qcom/venus/core.c

+6 −2
Original line number Diff line number Diff line
@@ -289,11 +289,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)
@@ -329,6 +329,10 @@ static int venus_probe(struct platform_device *pdev) 
	hfi_core_deinit(core, false);

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);