diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
| commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
| tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/media | |
| parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
| parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/video-buf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index 635d102c86f0..6504a5866849 100644 --- a/drivers/media/video/video-buf.c +++ b/drivers/media/video/video-buf.c | |||
| @@ -700,6 +700,7 @@ videobuf_qbuf(struct videobuf_queue *q, | |||
| 700 | goto done; | 700 | goto done; |
| 701 | } | 701 | } |
| 702 | if (buf->state == STATE_QUEUED || | 702 | if (buf->state == STATE_QUEUED || |
| 703 | buf->state == STATE_PREPARED || | ||
| 703 | buf->state == STATE_ACTIVE) { | 704 | buf->state == STATE_ACTIVE) { |
| 704 | dprintk(1,"qbuf: buffer is already queued or active.\n"); | 705 | dprintk(1,"qbuf: buffer is already queued or active.\n"); |
| 705 | goto done; | 706 | goto done; |