Commit 3f84307a authored by Adrian Bunk's avatar Adrian Bunk Committed by Mauro Carvalho Chehab

V4L/DVB (6803): buf-core.c locking fixes

After commit 19fb1457 the callers in
videobuf-core.c that already hold the lock must call
__videobuf_read_start() instead of videobuf_read_start().
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent da8cadb3
...@@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q, ...@@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
if (q->streaming) if (q->streaming)
goto done; goto done;
if (!q->reading) { if (!q->reading) {
retval = videobuf_read_start(q); retval = __videobuf_read_start(q);
if (retval < 0) if (retval < 0)
goto done; goto done;
} }
...@@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file, ...@@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file,
struct videobuf_buffer, stream); struct videobuf_buffer, stream);
} else { } else {
if (!q->reading) if (!q->reading)
videobuf_read_start(q); __videobuf_read_start(q);
if (!q->reading) { if (!q->reading) {
rc = POLLERR; rc = POLLERR;
} else if (NULL == q->read_buf) { } else if (NULL == q->read_buf) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment