Commit 5a465c53 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mauro Carvalho Chehab
Browse files

media: venus: core: Fix some resource leaks in the error path of 'venus_probe()' 



If an error occurs after a successful 'of_icc_get()' call, it must be
undone.

Use 'devm_of_icc_get()' instead of 'of_icc_get()' to avoid the leak.
Update the remove function accordingly and axe the now unneeded
'icc_put()' calls.

Fixes: 32f0a6dd ("media: venus: Use on-chip interconnect API")
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>
parent 08c06797

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

+2 −5
Original line number Diff line number Diff line
@@ -225,11 +225,11 @@ static int venus_probe(struct platform_device *pdev) 
	if (IS_ERR(core->base))

		return PTR_ERR(core->base);



	core->video_path = of_icc_get(dev, "video-mem");

	core->video_path = devm_of_icc_get(dev, "video-mem");

	if (IS_ERR(core->video_path))

		return PTR_ERR(core->video_path);



	core->cpucfg_path = of_icc_get(dev, "cpu-cfg");

	core->cpucfg_path = devm_of_icc_get(dev, "cpu-cfg");

	if (IS_ERR(core->cpucfg_path))

		return PTR_ERR(core->cpucfg_path);
@@ -364,9 +364,6 @@ static int venus_remove(struct platform_device *pdev) 


	hfi_destroy(core);



	icc_put(core->video_path);

	icc_put(core->cpucfg_path);



	v4l2_device_unregister(&core->v4l2_dev);

	mutex_destroy(&core->pm_lock);

	mutex_destroy(&core->lock);