diff options
| author |   Oleg Nesterov <oleg@tv-sign.ru> | 2007-01-23 20:04:13 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-23 22:00:21 -0200 |
| commit | 419dd8378dfa32985672ab7927b4bc827f33b332 (patch) | |
| tree | 1dd1dad1ae3593a7042b993fd21cbdee626a9ac8 /drivers/media | |
| parent | Change Linus' email address too (diff) | |
| download | linux-dev-419dd8378dfa32985672ab7927b4bc827f33b332.tar.xz linux-dev-419dd8378dfa32985672ab7927b4bc827f33b332.zip | |
V4L/DVB (5123): Buf_qbuf: fix: videobuf_queue->stream corruption and lockup
We are doing ->buf_prepare(buf) before adding buf to q->stream list. This
means that videobuf_qbuf() should not try to re-add a STATE_PREPARED buffer.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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, goto done; } if (buf->state == STATE_QUEUED || + buf->state == STATE_PREPARED || buf->state == STATE_ACTIVE) { dprintk(1,"qbuf: buffer is already queued or active.\n"); goto done; |