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.jail...@wanadoo.fr>
---
v1->v2: use managed resources instead of expanding the error handling path.
---
 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 0bde19edac86..c2458dee794b 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.27.0

Reply via email to