diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-12-25 15:40:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-30 19:29:26 -0500 |
commit | b6a633c18ba83c0c8e96759a31d356bfb77e2b5f (patch) | |
tree | 28e006e9006142d80b512fdd1c4290c43543c45e /drivers/media/video/mx2_camera.c | |
parent | c85bb69af09988f728aca825c11267c9d06ba32e (diff) |
[media] v4l: soc-camera: switch to .unlocked_ioctl
Use the V4L mutex infrastructure in soc-camera core and drivers and switch to
.unlocked_ioctl.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mx2_camera.c')
-rw-r--r-- | drivers/media/video/mx2_camera.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 13565cba237d..4eab1c620318 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c | |||
@@ -683,7 +683,8 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q, | |||
683 | 683 | ||
684 | videobuf_queue_dma_contig_init(q, &mx2_videobuf_ops, pcdev->dev, | 684 | videobuf_queue_dma_contig_init(q, &mx2_videobuf_ops, pcdev->dev, |
685 | &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, | 685 | &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, |
686 | V4L2_FIELD_NONE, sizeof(struct mx2_buffer), icd, NULL); | 686 | V4L2_FIELD_NONE, sizeof(struct mx2_buffer), |
687 | icd, &icd->video_lock); | ||
687 | } | 688 | } |
688 | 689 | ||
689 | #define MX2_BUS_FLAGS (SOCAM_DATAWIDTH_8 | \ | 690 | #define MX2_BUS_FLAGS (SOCAM_DATAWIDTH_8 | \ |