Commit 667b1de3 authored Jan 02, 2021 by Dinghao Liu Committed by Greg Kroah-Hartman Mar 03, 2021

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: 2ada815f ("[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>

parent 70738fc7

drivers/media/pci/saa7134/saa7134-empress.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -295,8 +295,11 @@ static int empress_init(struct saa7134_dev *dev)
		q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
		q->lock = &dev->lock;
		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);