diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-12-12 14:44:54 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 21:15:25 -0500 |
| commit | 3f84307a10b4d9039c5c8f718bcdd0928c9994c1 (patch) | |
| tree | 2fc1b5ecf9cc0d18bf3530ff04ed70db2d13ed68 /drivers/media | |
| parent | da8cadb31b82c9d41fc593c8deab6aa20b162d6b (diff) | |
V4L/DVB (6803): buf-core.c locking fixes
After commit 19fb1457990b6b7e15586ec7331541a184233acc 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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/videobuf-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 81f77d2b4bd3..c8a5cb57963b 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
| @@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q, | |||
| 909 | if (q->streaming) | 909 | if (q->streaming) |
| 910 | goto done; | 910 | goto done; |
| 911 | if (!q->reading) { | 911 | if (!q->reading) { |
| 912 | retval = videobuf_read_start(q); | 912 | retval = __videobuf_read_start(q); |
| 913 | if (retval < 0) | 913 | if (retval < 0) |
| 914 | goto done; | 914 | goto done; |
| 915 | } | 915 | } |
| @@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file, | |||
| 982 | struct videobuf_buffer, stream); | 982 | struct videobuf_buffer, stream); |
| 983 | } else { | 983 | } else { |
| 984 | if (!q->reading) | 984 | if (!q->reading) |
| 985 | videobuf_read_start(q); | 985 | __videobuf_read_start(q); |
| 986 | if (!q->reading) { | 986 | if (!q->reading) { |
| 987 | rc = POLLERR; | 987 | rc = POLLERR; |
| 988 | } else if (NULL == q->read_buf) { | 988 | } else if (NULL == q->read_buf) { |