diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /drivers/media/video/video-buf.c | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/video/video-buf.c')
| -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; |