diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-20 16:24:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:14 -0400 |
commit | 97397687886aa8ecd4ec603fab9e70e970c11597 (patch) | |
tree | 339d460b43d2ec7206c9d147d2ad6f8fcbfa3870 /drivers/media/video/videobuf-dma-contig.c | |
parent | ee6869afc922a9849979e49bb3bbcad794872fcb (diff) |
V4L/DVB: videobuf: prepare to make locking optional in videobuf
Currently videobuf uses the vb_lock mutex to lock its data structures.
But this locking will (optionally) move into the v4l2 core, which means
that in that case vb_lock shouldn't be used since the external lock is already
held.
Prepare for this by adding a pointer to such an external mutex and
don't lock if that pointer is set.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/videobuf-dma-contig.c')
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 6ff9e4bac3e..047054f7960 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -63,7 +63,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma) | |||
63 | struct videobuf_dma_contig_memory *mem; | 63 | struct videobuf_dma_contig_memory *mem; |
64 | 64 | ||
65 | dev_dbg(q->dev, "munmap %p q=%p\n", map, q); | 65 | dev_dbg(q->dev, "munmap %p q=%p\n", map, q); |
66 | mutex_lock(&q->vb_lock); | 66 | videobuf_queue_lock(q); |
67 | 67 | ||
68 | /* We need first to cancel streams, before unmapping */ | 68 | /* We need first to cancel streams, before unmapping */ |
69 | if (q->streaming) | 69 | if (q->streaming) |
@@ -103,7 +103,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma) | |||
103 | 103 | ||
104 | kfree(map); | 104 | kfree(map); |
105 | 105 | ||
106 | mutex_unlock(&q->vb_lock); | 106 | videobuf_queue_unlock(q); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||