V4L/DVB (5842): ivtv: Add locking to ensure stream setup is atomic.

[linux-2.6-omap-h63xx.git] / drivers / media / video / video-buf.c

diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index 459786ff459a97df7bd3c56e3140a29ac0282d96..a32dfbe0585af96de2c9acc126e5fd0e6fb1edd8 100644 (file)
--- a/drivers/media/video/video-buf.c
+++ b/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;
        }