diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-27 07:16:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-27 07:16:13 -0300 |
| commit | 7cc61109ba84b617325299f34efd62fd0ba8e399 (patch) | |
| tree | 79099674cf21cf924bfae67ec9fc822eddc870e4 /linux | |
| parent | a2161a6ec00e6f73b7dfdd795062c53c1671bd0e (diff) | |
| parent | 50078bb28b21b2ffb6ddd69c02a97cf2762661ec (diff) | |
| download | mediapointer-dvb-s2-7cc61109ba84b617325299f34efd62fd0ba8e399.tar.gz mediapointer-dvb-s2-7cc61109ba84b617325299f34efd62fd0ba8e399.tar.bz2 | |
merge: http://ifup.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/videobuf-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/videobuf-core.c b/linux/drivers/media/video/videobuf-core.c index b5395c538..86f32545c 100644 --- a/linux/drivers/media/video/videobuf-core.c +++ b/linux/drivers/media/video/videobuf-core.c @@ -606,7 +606,9 @@ int videobuf_dqbuf(struct videobuf_queue *q, goto done; } buf = list_entry(q->stream.next, struct videobuf_buffer, stream); + mutex_unlock(&q->vb_lock); retval = videobuf_waiton(buf, nonblocking, 1); + mutex_lock(&q->vb_lock); if (retval < 0) { dprintk(1, "dqbuf: waiton returned %d\n", retval); goto done; |