diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-12 08:43:22 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-12 08:43:22 +1100 |
| commit | 486936cd93e99c802153b3f2f629c5ce62b8c0d4 (patch) | |
| tree | 51e261a96e1fb6b51d4a6afb92bfc2480e150b6c /drivers/media/video/cx18/cx18-queue.c | |
| parent | 1c1b777a5673b57a6c0377ba60a790d05e4a0676 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
| download | op-kernel-dev-486936cd93e99c802153b3f2f629c5ce62b8c0d4.zip op-kernel-dev-486936cd93e99c802153b3f2f629c5ce62b8c0d4.tar.gz | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/media/video/cx18/cx18-queue.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-queue.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c index a33ba04..174682c 100644 --- a/drivers/media/video/cx18/cx18-queue.c +++ b/drivers/media/video/cx18/cx18-queue.c @@ -88,15 +88,13 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id, if (buf->id != id) continue; + buf->bytesused = bytesused; - /* the transport buffers are handled differently, - they are not moved to the full queue */ - if (s->type != CX18_ENC_STREAM_TYPE_TS) { - atomic_dec(&s->q_free.buffers); - atomic_inc(&s->q_full.buffers); - s->q_full.bytesused += buf->bytesused; - list_move_tail(&buf->list, &s->q_full.list); - } + atomic_dec(&s->q_free.buffers); + atomic_inc(&s->q_full.buffers); + s->q_full.bytesused += buf->bytesused; + list_move_tail(&buf->list, &s->q_full.list); + spin_unlock(&s->qlock); return buf; } |
