diff mbox

[v2,media] sta2x11_vip: fix error return code in sta2x11_vip_init_one()

Message ID CAPgLHd8gFagqNM8y3WAfw1F8sddPWzB9TN1U8EOF8VrknOoeOg@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Yongjun May 13, 2013, 2 p.m. UTC 
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(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Federico Vaga May 13, 2013, 2:02 p.m. UTC | #1 
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",
diff mbox

Patch

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",