| From f6a15af2988c55b6f55fd02a2b9d5c66018533f2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 28 Jan 2021 21:22:34 +0100 |
| Subject: media: venus: core: Fix some resource leaks in the error path of |
| 'venus_probe()' |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 5a465c5391a856a0c1e9554964d660676c35d1b2 ] |
| |
| 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: 32f0a6ddc8c9 ("media: venus: Use on-chip interconnect API") |
| 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> |
| --- |
| drivers/media/platform/qcom/venus/core.c | 7 ++----- |
| 1 file changed, 2 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c |
| index 7233a7311757..4b318dfd7177 100644 |
| --- a/drivers/media/platform/qcom/venus/core.c |
| +++ b/drivers/media/platform/qcom/venus/core.c |
| @@ -195,11 +195,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); |
| |
| @@ -334,9 +334,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); |
| -- |
| 2.30.2 |
| |