* [PATCH v2] [media] sta2x11_vip: fix error return code in sta2x11_vip_init_one()
@ 2013-05-13 14:00 Wei Yongjun
2013-05-13 14:02 ` Federico Vaga
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-05-13 14:00 UTC (permalink / raw)
To: mchehab, hans.verkuil, giancarlo.asnaghi, federico.vaga,
prabhakar.csengg
Cc: yongjun_wei, linux-media
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
The orig code will release all the resources if v4l2_device_register()
failed and return 0. But what we need in this case is to return an
negative error code to let the caller known we are failed.
So the patch save the return value of v4l2_device_register() to 'ret'
and return it when error.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
v1 -> v2: change the commit message
---
drivers/media/pci/sta2x11/sta2x11_vip.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
index 7005695..77edc11 100644
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -1047,7 +1047,8 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev,
ret = sta2x11_vip_init_controls(vip);
if (ret)
goto free_mem;
- if (v4l2_device_register(&pdev->dev, &vip->v4l2_dev))
+ ret = v4l2_device_register(&pdev->dev, &vip->v4l2_dev);
+ if (ret)
goto free_mem;
dev_dbg(&pdev->dev, "BAR #0 at 0x%lx 0x%lx irq %d\n",
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] [media] sta2x11_vip: fix error return code in sta2x11_vip_init_one()
2013-05-13 14:00 [PATCH v2] [media] sta2x11_vip: fix error return code in sta2x11_vip_init_one() Wei Yongjun
@ 2013-05-13 14:02 ` Federico Vaga
0 siblings, 0 replies; 2+ messages in thread
From: Federico Vaga @ 2013-05-13 14:02 UTC (permalink / raw)
To: Wei Yongjun
Cc: mchehab, hans.verkuil, giancarlo.asnaghi, prabhakar.csengg,
yongjun_wei, linux-media
On Monday 13 May 2013 22:00:01 Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> The orig code will release all the resources if v4l2_device_register()
> failed and return 0. But what we need in this case is to return an
> negative error code to let the caller known we are failed.
> So the patch save the return value of v4l2_device_register() to 'ret'
> and return it when error.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Federico Vaga <federico.vaga@gmail.com>
> ---
> v1 -> v2: change the commit message
> ---
> drivers/media/pci/sta2x11/sta2x11_vip.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c
> b/drivers/media/pci/sta2x11/sta2x11_vip.c index 7005695..77edc11 100644
> --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
> +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
> @@ -1047,7 +1047,8 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev,
> ret = sta2x11_vip_init_controls(vip);
> if (ret)
> goto free_mem;
> - if (v4l2_device_register(&pdev->dev, &vip->v4l2_dev))
> + ret = v4l2_device_register(&pdev->dev, &vip->v4l2_dev);
> + if (ret)
> goto free_mem;
>
> dev_dbg(&pdev->dev, "BAR #0 at 0x%lx 0x%lx irq %d\n",
--
Federico Vaga
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-13 14:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-13 14:00 [PATCH v2] [media] sta2x11_vip: fix error return code in sta2x11_vip_init_one() Wei Yongjun
2013-05-13 14:02 ` Federico Vaga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox