Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08bff03e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: videobuf: add ext_lock argument to the queue init functions 



Add an ext_lock argument to the videobuf init functions. This allows
drivers to pass the vdev->lock pointer (or any other externally held lock)
to videobuf. For now all drivers just pass NULL.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 97397687

drivers/media/common/saa7146_vbi.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) 
			    V4L2_BUF_TYPE_VBI_CAPTURE,

			    V4L2_FIELD_SEQ_TB, // FIXME: does this really work?

			    sizeof(struct saa7146_buf),

			    file);

			    file, NULL);



	init_timer(&fh->vbi_read_timeout);

	fh->vbi_read_timeout.function = vbi_read_timeout;

drivers/media/common/saa7146_video.c

+1 −1
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file) 
			    V4L2_BUF_TYPE_VIDEO_CAPTURE,

			    V4L2_FIELD_INTERLACED,

			    sizeof(struct saa7146_buf),

			    file);

			    file, NULL);



	return 0;

}

drivers/media/video/au0828/au0828-video.c

+2 −2
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ static int au0828_v4l2_open(struct file *filp) 
				    NULL, &dev->slock,

				    V4L2_BUF_TYPE_VIDEO_CAPTURE,

				    V4L2_FIELD_INTERLACED,

				    sizeof(struct au0828_buffer), fh);

				    sizeof(struct au0828_buffer), fh, NULL);



	/* VBI Setup */

	dev->vbi_width = 720;
@@ -974,7 +974,7 @@ static int au0828_v4l2_open(struct file *filp) 
				    NULL, &dev->slock,

				    V4L2_BUF_TYPE_VBI_CAPTURE,

				    V4L2_FIELD_SEQ_TB,

				    sizeof(struct au0828_buffer), fh);

				    sizeof(struct au0828_buffer), fh, NULL);





	return ret;

drivers/media/video/bt8xx/bttv-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -3318,13 +3318,13 @@ static int bttv_open(struct file *file) 
			    V4L2_BUF_TYPE_VIDEO_CAPTURE,

			    V4L2_FIELD_INTERLACED,

			    sizeof(struct bttv_buffer),

			    fh);

			    fh, NULL);

	videobuf_queue_sg_init(&fh->vbi, &bttv_vbi_qops,

			    &btv->c.pci->dev, &btv->s_lock,

			    V4L2_BUF_TYPE_VBI_CAPTURE,

			    V4L2_FIELD_SEQ_TB,

			    sizeof(struct bttv_buffer),

			    fh);

			    fh, NULL);

	set_tvnorm(btv,btv->tvnorm);

	set_input(btv, btv->input, btv->tvnorm);

drivers/media/video/cx231xx/cx231xx-video.c

+4 −2
Original line number Diff line number Diff line
@@ -2008,7 +2008,8 @@ static int cx231xx_v4l2_open(struct file *filp) 
		videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_video_qops,

					    NULL, &dev->video_mode.slock,

					    fh->type, V4L2_FIELD_INTERLACED,

					    sizeof(struct cx231xx_buffer), fh);

					    sizeof(struct cx231xx_buffer),

					    fh, NULL);

	if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {

		/* Set the required alternate setting  VBI interface works in

		   Bulk mode only */
@@ -2017,7 +2018,8 @@ static int cx231xx_v4l2_open(struct file *filp) 
		videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_vbi_qops,

					    NULL, &dev->vbi_mode.slock,

					    fh->type, V4L2_FIELD_SEQ_TB,

					    sizeof(struct cx231xx_buffer), fh);

					    sizeof(struct cx231xx_buffer),

					    fh, NULL);

	}



	mutex_unlock(&dev->lock);