[PATCH] media: dw100: Fix an error handling path in dw100_probe()

Christophe JAILLET posted 1 patch 3 years, 7 months ago
drivers/media/platform/nxp/dw100/dw100.c | 1 +
1 file changed, 1 insertion(+)
[PATCH] media: dw100: Fix an error handling path in dw100_probe()
Posted by Christophe JAILLET 3 years, 7 months ago
After a successful call to media_device_init() it is safer to call
media_device_init().

Add the missing call in the error handling path of the probe, as already
done in the remove function.

Fixes: bd090d4d995a ("media: dw100: Add i.MX8MP dw100 dewarper driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/media/platform/nxp/dw100/dw100.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/nxp/dw100/dw100.c b/drivers/media/platform/nxp/dw100/dw100.c
index 94518f0e486b..b3b057798ab6 100644
--- a/drivers/media/platform/nxp/dw100/dw100.c
+++ b/drivers/media/platform/nxp/dw100/dw100.c
@@ -1623,6 +1623,7 @@ static int dw100_probe(struct platform_device *pdev)
 error_v4l2:
 	video_unregister_device(vfd);
 err_m2m:
+	media_device_cleanup(&dw_dev->mdev);
 	v4l2_m2m_release(dw_dev->m2m_dev);
 err_v4l2:
 	v4l2_device_unregister(&dw_dev->v4l2_dev);
-- 
2.34.1
Re: [PATCH] media: dw100: Fix an error handling path in dw100_probe()
Posted by Dan Carpenter 3 years, 7 months ago
On Mon, Aug 22, 2022 at 11:40:43AM +0200, Christophe JAILLET wrote:
> After a successful call to media_device_init() it is safer to call
> media_device_init().

s/media_device_init/media_device_cleanup/.

regards,
dan carpenter
Re: [PATCH] media: dw100: Fix an error handling path in dw100_probe()
Posted by Laurent Pinchart 3 years, 7 months ago
Hi Christophe,

Thank you for the patch.

On Mon, Aug 22, 2022 at 11:40:43AM +0200, Christophe JAILLET wrote:
> After a successful call to media_device_init() it is safer to call
> media_device_init().

I assume you meant media_device_cleanup() ? With this fixed,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> Add the missing call in the error handling path of the probe, as already
> done in the remove function.
> 
> Fixes: bd090d4d995a ("media: dw100: Add i.MX8MP dw100 dewarper driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/media/platform/nxp/dw100/dw100.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/media/platform/nxp/dw100/dw100.c b/drivers/media/platform/nxp/dw100/dw100.c
> index 94518f0e486b..b3b057798ab6 100644
> --- a/drivers/media/platform/nxp/dw100/dw100.c
> +++ b/drivers/media/platform/nxp/dw100/dw100.c
> @@ -1623,6 +1623,7 @@ static int dw100_probe(struct platform_device *pdev)
>  error_v4l2:
>  	video_unregister_device(vfd);
>  err_m2m:
> +	media_device_cleanup(&dw_dev->mdev);
>  	v4l2_m2m_release(dw_dev->m2m_dev);
>  err_v4l2:
>  	v4l2_device_unregister(&dw_dev->v4l2_dev);

-- 
Regards,

Laurent Pinchart
Re: [PATCH] media: dw100: Fix an error handling path in dw100_probe()
Posted by Christophe JAILLET 3 years, 7 months ago
Le 22/08/2022 à 11:56, Laurent Pinchart a écrit :
> Hi Christophe,
> 
> Thank you for the patch.
> 
> On Mon, Aug 22, 2022 at 11:40:43AM +0200, Christophe JAILLET wrote:
>> After a successful call to media_device_init() it is safer to call
>> media_device_init().
> 
> I assume you meant media_device_cleanup() ? With this fixed,

+1.
I assume that it can be fixed when applied (otherwise tell me and I'll 
send a v2).

CJ

> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
>> Add the missing call in the error handling path of the probe, as already
>> done in the remove function.
>>
>> Fixes: bd090d4d995a ("media: dw100: Add i.MX8MP dw100 dewarper driver")
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>> ---
>>   drivers/media/platform/nxp/dw100/dw100.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/media/platform/nxp/dw100/dw100.c b/drivers/media/platform/nxp/dw100/dw100.c
>> index 94518f0e486b..b3b057798ab6 100644
>> --- a/drivers/media/platform/nxp/dw100/dw100.c
>> +++ b/drivers/media/platform/nxp/dw100/dw100.c
>> @@ -1623,6 +1623,7 @@ static int dw100_probe(struct platform_device *pdev)
>>   error_v4l2:
>>   	video_unregister_device(vfd);
>>   err_m2m:
>> +	media_device_cleanup(&dw_dev->mdev);
>>   	v4l2_m2m_release(dw_dev->m2m_dev);
>>   err_v4l2:
>>   	v4l2_device_unregister(&dw_dev->v4l2_dev);
>