Commit 15d0c522 authored by Dinghao Liu's avatar Dinghao Liu Committed by Mauro Carvalho Chehab
Browse files

media: media/pci: Fix memleak in empress_init 



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: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent cf73a660

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

+4 −1
Original line number Diff line number Diff line
@@ -282,8 +282,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;

	dev->empress_dev->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_STREAMING |

					V4L2_CAP_VIDEO_CAPTURE;