This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: saa7146: fix error logic at saa7146_vv_init()
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Tue Dec 14 14:52:28 2021 +0100

As the first thing this function does is to call
v4l2_device_register(), it should call v4l2_device_unregister()
if an error occurs, the same way as done at saa7146_vv_release().

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/common/saa7146/saa7146_fops.c | 3 +++
 1 file changed, 3 insertions(+)

---

diff --git a/drivers/media/common/saa7146/saa7146_fops.c 
b/drivers/media/common/saa7146/saa7146_fops.c
index be3215977714..e9a15de6126e 100644
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -487,6 +487,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct 
saa7146_ext_vv *ext_vv)
        if (hdl->error) {
                err = hdl->error;
                v4l2_ctrl_handler_free(hdl);
+               v4l2_device_unregister(&dev->v4l2_dev);
                return err;
        }
        dev->v4l2_dev.ctrl_handler = hdl;
@@ -495,6 +496,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct 
saa7146_ext_vv *ext_vv)
        if (vv == NULL) {
                ERR("out of memory. aborting.\n");
                v4l2_ctrl_handler_free(hdl);
+               v4l2_device_unregister(&dev->v4l2_dev);
                return -ENOMEM;
        }
        ext_vv->vid_ops = saa7146_video_ioctl_ops;
@@ -521,6 +523,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct 
saa7146_ext_vv *ext_vv)
                ERR("out of memory. aborting.\n");
                kfree(vv);
                v4l2_ctrl_handler_free(hdl);
+               v4l2_device_unregister(&dev->v4l2_dev);
                return -ENOMEM;
        }
 

_______________________________________________
linuxtv-commits mailing list
[email protected]
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to