diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 20:44:54 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 20:44:54 +0100 |
| commit | 17dadc3798052cea3509d4758b8f08e889a1b7df (patch) | |
| tree | fa491e9777ccb3fc3dd3ebbead86a3382924716a /linux/drivers/media/video/videobuf-core.c | |
| parent | 4981413b8584d461413c56d89f91b5d11796aa31 (diff) | |
| download | mediapointer-dvb-s2-17dadc3798052cea3509d4758b8f08e889a1b7df.tar.gz mediapointer-dvb-s2-17dadc3798052cea3509d4758b8f08e889a1b7df.tar.bz2 | |
buf-core.c locking fixes
From: Adrian Bunk <bunk@stusta.de>
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 'linux/drivers/media/video/videobuf-core.c')
| -rw-r--r-- | linux/drivers/media/video/videobuf-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/videobuf-core.c b/linux/drivers/media/video/videobuf-core.c index a85b22147..0758794d0 100644 --- a/linux/drivers/media/video/videobuf-core.c +++ b/linux/drivers/media/video/videobuf-core.c @@ -916,7 +916,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; } @@ -989,7 +989,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) { |