From 449797624c281454e40893af8aef482a9de4675a Mon Sep 17 00:00:00 2001
From: Brandon Philips <bphilips@suse.de>
Date: Thu, 27 Sep 2007 20:55:28 -0300
Subject: [PATCH] --- yaml --- r: 65939 b: refs/heads/master c:
 00f98d0804c88c29bef81cb98c861f13c9b33f30 h: refs/heads/master i:   65937:
 792cf62705aba162525b7863c69c2dec121406f8   65935:
 1ec845143ab47ee5cbfbfd5957121cd374c898da v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/videobuf-core.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 22b4def93b94..39241879b29b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba32bd95d431525ad2ffac97cadf9ee40b63939e
+refs/heads/master: 00f98d0804c88c29bef81cb98c861f13c9b33f30
diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c
index a27e114cacef..ca67f80184bd 100644
--- a/trunk/drivers/media/video/videobuf-core.c
+++ b/trunk/drivers/media/video/videobuf-core.c
@@ -289,16 +289,18 @@ int videobuf_reqbufs(struct videobuf_queue *q,
 		return -EINVAL;
 	}
 
+	mutex_lock(&q->lock);
 	if (q->streaming) {
 		dprintk(1,"reqbufs: streaming already exists\n");
-		return -EBUSY;
+		retval = -EBUSY;
+		goto done;
 	}
 	if (!list_empty(&q->stream)) {
 		dprintk(1,"reqbufs: stream running\n");
-		return -EBUSY;
+		retval = -EBUSY;
+		goto done;
 	}
 
-	mutex_lock(&q->lock);
 	count = req->count;
 	if (count > VIDEO_MAX_FRAME)
 		count = VIDEO_MAX_FRAME;