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

Commit e3cfd447 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 (part 2) 



Missed a few init functions on non-Intel platforms the first time :-(

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

drivers/media/video/davinci/vpfe_capture.c

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static int vpfe_reqbufs(struct file *file, void *priv, 
				req_buf->type,

				vpfe_dev->fmt.fmt.pix.field,

				sizeof(struct videobuf_buffer),

				fh);

				fh, NULL);



	fh->io_allowed = 1;

	vpfe_dev->io_usrs = 1;

drivers/media/video/davinci/vpif_capture.c

+2 −1
Original line number Diff line number Diff line
@@ -927,7 +927,8 @@ static int vpif_reqbufs(struct file *file, void *priv, 
					    &common->irqlock,

					    reqbuf->type,

					    common->fmt.fmt.pix.field,

					    sizeof(struct videobuf_buffer), fh);

					    sizeof(struct videobuf_buffer), fh,

					    NULL);



	/* Set io allowed member of file handle to TRUE */

	fh->io_allowed[index] = 1;

drivers/media/video/davinci/vpif_display.c

+2 −1
Original line number Diff line number Diff line
@@ -853,7 +853,8 @@ static int vpif_reqbufs(struct file *file, void *priv, 
					    &video_qops, NULL,

					    &common->irqlock,

					    reqbuf->type, field,

					    sizeof(struct videobuf_buffer), fh);

					    sizeof(struct videobuf_buffer), fh,

					    NULL);



	/* Set io allowed member of file handle to TRUE */

	fh->io_allowed[index] = 1;

drivers/media/video/fsl-viu.c

+1 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ static int viu_open(struct file *file) 
	videobuf_queue_dma_contig_init(&fh->vb_vidq, &viu_video_qops,

				       dev->dev, &fh->vbq_lock,

				       fh->type, V4L2_FIELD_INTERLACED,

				       sizeof(struct viu_buf), fh);

				       sizeof(struct viu_buf), fh, NULL);

	return 0;

}

drivers/media/video/mx1_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q, 
					&pcdev->lock,

					V4L2_BUF_TYPE_VIDEO_CAPTURE,

					V4L2_FIELD_NONE,

					sizeof(struct mx1_buffer), icd);

					sizeof(struct mx1_buffer), icd, NULL);

}



static int mclk_get_divisor(struct mx1_camera_dev *pcdev)