]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] sta2x11_vip: fix error return code in sta2x11_vip_init_one()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 13 May 2013 13:00:01 +0000 (10:00 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 27 May 2013 11:51:45 +0000 (08:51 -0300)
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>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/pci/sta2x11/sta2x11_vip.c

index 7005695aa4bd26cfaffc4edabb33420412321ddb..77edc113e48520228b587fb2d092e94f0ccfb54a 100644 (file)
@@ -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",