From dff54ecb5d4ebbc138b0c45e12aae4ad782c1b2f Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@nokia.com>
Date: Fri, 4 May 2007 12:19:59 -0300
Subject: [PATCH] --- yaml --- r: 56074 b: refs/heads/master c:
 36a63ee34b568de8d0762f9b07f34ae5caae7724 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 193ba11feb42..4b70d95a3cec 100644
--- 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
index 459786ff459a..a32dfbe0585a 100644
--- 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;
 	}