Commit 24d8c029 authored Dec 25, 2010 by Guennadi Liakhovetski Committed by Mauro Carvalho Chehab Dec 25, 2010

[media] v4l: soc-camera: fix multiple simultaneous user case



A recent patch has introduced a regression, whereby a second open of an
soc-camera video device breaks the running capture. This patch fixes this bug
by guaranteeing, that video buffers get initialised only during the first open
of the device node.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 501aaa11

drivers/media/video/soc_camera.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -405,13 +405,13 @@ static int soc_camera_open(struct file *file)
		ret = soc_camera_set_fmt(icd, &f);
		if (ret < 0)
		goto esfmt;

		ici->ops->init_videobuf(&icd->vb_vidq, icd);
		}

		file->private_data = icd;
		dev_dbg(&icd->dev, "camera device open\n");

		ici->ops->init_videobuf(&icd->vb_vidq, icd);

		mutex_unlock(&icd->video_lock);

		return 0;