diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-04 10:04:56 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-04 10:04:56 -0300 |
commit | ca95082f33a1a2a02ba3a5f473c1f2e855444944 (patch) | |
tree | 4a703f34041e5eb28ea77f8b0011c39c608ae9d7 /linux/drivers/media/video/videobuf-core.c | |
parent | 8685de05c5cb11b514464009970b4fd72ba2e861 (diff) | |
parent | 02f63ce8fd4d1c7ee5e5ba9d4eab01f9cff12f94 (diff) | |
download | mediapointer-dvb-s2-ca95082f33a1a2a02ba3a5f473c1f2e855444944.tar.gz mediapointer-dvb-s2-ca95082f33a1a2a02ba3a5f473c1f2e855444944.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
From: Mauro Carvalho Chehab <mchehab@infradead.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 | 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; |