[v1] media: coda: Fix missing put_device() call in coda_get_vdoa_data

[PATCH] media: coda: Fix missing put_device() call in coda_get_vdoa_data

Posted by Miaoqian Lin 4 years, 5 months ago

The reference taken by 'of_find_device_by_node()' must be released when
not needed anymore.
Add the corresponding 'put_device()' in the error handling path.

Fixes: e7f3c5481035 ("[media] coda: use VDOA for un-tiling custom macroblock format")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/media/platform/coda/coda-common.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 0e312b0842d7..579849082488 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -405,9 +405,13 @@ static struct vdoa_data *coda_get_vdoa_data(void)
 		goto out;
 
 	vdoa_data = platform_get_drvdata(vdoa_pdev);
-	if (!vdoa_data)
+	if (!vdoa_data) {
 		vdoa_data = ERR_PTR(-EPROBE_DEFER);
+		goto put;
+	}
 
+put:
+	put_device(&vdoa_pdev->dev);
 out:
 	of_node_put(vdoa_node);
 
-- 
2.17.1

Re: [PATCH] media: coda: Fix missing put_device() call in coda_get_vdoa_data

Posted by Hans Verkuil 4 years, 5 months ago

On 07/01/2022 09:18, Miaoqian Lin wrote:
> The reference taken by 'of_find_device_by_node()' must be released when
> not needed anymore.
> Add the corresponding 'put_device()' in the error handling path.
> 
> Fixes: e7f3c5481035 ("[media] coda: use VDOA for un-tiling custom macroblock format")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
>  drivers/media/platform/coda/coda-common.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
> index 0e312b0842d7..579849082488 100644
> --- a/drivers/media/platform/coda/coda-common.c
> +++ b/drivers/media/platform/coda/coda-common.c
> @@ -405,9 +405,13 @@ static struct vdoa_data *coda_get_vdoa_data(void)
>  		goto out;
>  
>  	vdoa_data = platform_get_drvdata(vdoa_pdev);
> -	if (!vdoa_data)
> +	if (!vdoa_data) {
>  		vdoa_data = ERR_PTR(-EPROBE_DEFER);
> +		goto put;

Why the goto put? Just drop the goto...

> +	}
>  
> +put:

...and this label.

> +	put_device(&vdoa_pdev->dev);

This is the real fix :-)

Regards,

	Hans

>  out:
>  	of_node_put(vdoa_node);
>

[PATCH v2] media: coda: Fix missing put_device() call in coda_get_vdoa_data

Posted by Miaoqian Lin 4 years, 5 months ago

The reference taken by 'of_find_device_by_node()' must be released when
not needed anymore.
Add the corresponding 'put_device()' in the error handling path.

Fixes: e7f3c5481035 ("[media] coda: use VDOA for un-tiling custom macroblock format")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
Changes in v2:
- remove the goto and unused label.
---
 drivers/media/platform/coda/coda-common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 0e312b0842d7..c3942b0abb00 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -408,6 +408,7 @@ static struct vdoa_data *coda_get_vdoa_data(void)
 	if (!vdoa_data)
 		vdoa_data = ERR_PTR(-EPROBE_DEFER);
 
+	put_device(&vdoa_pdev->dev);
 out:
 	of_node_put(vdoa_node);
 
-- 
2.17.1