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;