---

yaml --- r: 56074 b: refs/heads/master c: 36a63ee h: refs/heads/master v: v3
git-mirror · May 9, 2007 · dff54ec · dff54ec
1 parent 4c8c3c2
commit dff54ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad5e4845b441a00e4165e2c2e3ac8507db9cbe6
+refs/heads/master: 36a63ee34b568de8d0762f9b07f34ae5caae7724
diff --git a/trunk/drivers/media/video/video-buf.c b/trunk/drivers/media/video/video-buf.c
@@ -702,9 +702,7 @@ videobuf_qbuf(struct videobuf_queue *q,
 		dprintk(1,"qbuf: memory type is wrong.\n");
 		goto done;
 	}
-	if (buf->state == STATE_QUEUED ||
-	    buf->state == STATE_PREPARED ||
-	    buf->state == STATE_ACTIVE) {
+	if (buf->state != STATE_NEEDS_INIT && buf->state != STATE_IDLE) {
 		dprintk(1,"qbuf: buffer is already queued or active.\n");
 		goto done;
 	}