From 9b6d2cfdbd8976d3d0b1db27d867d576e9b69117 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Tue, 22 Apr 2008 14:45:32 -0300 Subject: [PATCH] --- yaml --- r: 92422 b: refs/heads/master c: e43d76b40d3fda146b9cd1192c5504a257603b70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ecefa856115a..f8d17acbde15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dc4e48fbea5412127ce2eb30d688c4fc55f5565 +refs/heads/master: e43d76b40d3fda146b9cd1192c5504a257603b70 diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c index eab79ffdf56a..5ea635fac236 100644 --- a/trunk/drivers/media/video/videobuf-core.c +++ b/trunk/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;