Skip to content

Commit

Permalink
V4L/DVB (6803): buf-core.c locking fixes
Browse files Browse the repository at this point in the history
After commit 19fb145 the callers in
videobuf-core.c that already hold the lock must call
__videobuf_read_start() instead of videobuf_read_start().

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Adrian Bunk authored and Mauro Carvalho Chehab committed Dec 13, 2007
1 parent da8cadb commit 3f84307
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/videobuf-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
if (q->streaming)
goto done;
if (!q->reading) {
retval = videobuf_read_start(q);
retval = __videobuf_read_start(q);
if (retval < 0)
goto done;
}
Expand Down Expand Up @@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file,
struct videobuf_buffer, stream);
} else {
if (!q->reading)
videobuf_read_start(q);
__videobuf_read_start(q);
if (!q->reading) {
rc = POLLERR;
} else if (NULL == q->read_buf) {
Expand Down

0 comments on commit 3f84307

Please sign in to comment.