V4L/DVB (7281): v4l: Deadlock in videobuf-core for DQBUF waiting on QBUF

[linux-2.6-omap-h63xx.git] / drivers / media / video / videobuf-core.c

diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index eab79ffdf56a882529113c0e25623d0c5941ab1c..5ea635fac2364eefdf7e77891994b594aec2acec 100644 (file)
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -605,7 +605,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;