diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 13:00:28 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 13:00:28 -0200 |
| commit | 491d2fd7bd092c0938f38d7cef3b1d6e4cbcfbc9 (patch) | |
| tree | e9d75ebe6bef813a17fbd62f25a8ca3dca1e0532 /linux/drivers/media/video/cx88/cx88-core.c | |
| parent | cc59b40aea72b8d3929a89f65fcabb3b9b5746c4 (diff) | |
| parent | 52227110efbe3a7e7b28a0aa7185b126a6d3b9d7 (diff) | |
| download | mediapointer-dvb-s2-491d2fd7bd092c0938f38d7cef3b1d6e4cbcfbc9.tar.gz mediapointer-dvb-s2-491d2fd7bd092c0938f38d7cef3b1d6e4cbcfbc9.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index e3885a4d1..b67aa65e5 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -223,7 +223,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf) videobuf_dma_unmap(q, dma); videobuf_dma_free(dma); btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc); - buf->vb.state = STATE_NEEDS_INIT; + buf->vb.state = VIDEOBUF_NEEDS_INIT; } /* ------------------------------------------------------------------ */ @@ -565,7 +565,7 @@ void cx88_wakeup(struct cx88_core *core, do_gettimeofday(&buf->vb.ts); dprintk(2,"[%p/%d] wakeup reg=%d buf=%d\n",buf,buf->vb.i, count, buf->count); - buf->vb.state = STATE_DONE; + buf->vb.state = VIDEOBUF_DONE; list_del(&buf->vb.queue); wake_up(&buf->vb.done); } |