media: media/pci: Fix memleak in empress_init

[ Upstream commit 15d0c52241ecb1c9d802506bff6f5c3f7872c0df ]

When vb2_queue_init() fails, dev->empress_dev
should be released just like other error handling
paths.

Fixes: 2ada815fc48bb ("[media] saa7134: convert to vb2")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index f0fe2524259f0799e1ba9b6986b8310fb02839c2..522e1e18850fb21fef77680759d057e7e6c709c3 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -297,8 +297,11 @@ static int empress_init(struct saa7134_dev *dev)
        q->lock = &dev->lock;
        q->dev = &dev->pci->dev;
        err = vb2_queue_init(q);
-       if (err)
+       if (err) {
+               video_device_release(dev->empress_dev);
+               dev->empress_dev = NULL;
                return err;
+       }
        dev->empress_dev->queue = q;
 
        video_set_drvdata(dev->empress_dev, dev);