diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-16 20:37:51 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-16 20:37:51 -0500 |
| commit | d30a31decd05aa55764418cce0b9cce695885439 (patch) | |
| tree | 8fffef97b8b6d19639ed547eb7d6253b0f336e48 /linux/drivers/media/video/bttv-risc.c | |
| parent | e0449a4964c2aec77cf02c33d2a9375b647530ce (diff) | |
| parent | 32027c8007a8b9e82f70f5eb52387db827ff8b2d (diff) | |
| download | mediapointer-dvb-s2-d30a31decd05aa55764418cce0b9cce695885439.tar.gz mediapointer-dvb-s2-d30a31decd05aa55764418cce0b9cce695885439.tar.bz2 | |
merged ~mkrufky/pending
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/bttv-risc.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-risc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-risc.c b/linux/drivers/media/video/bttv-risc.c index 4efe74dd8..53dfe0f4d 100644 --- a/linux/drivers/media/video/bttv-risc.c +++ b/linux/drivers/media/video/bttv-risc.c @@ -277,6 +277,8 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc, if (line > maxy) btcx_calc_skips(line, ov->w.width, &maxy, skips, &nskips, ov->clips, ov->nclips); + else + nskips = 0; /* write out risc code */ for (start = 0, skip = 0; start < ov->w.width; start = end) { @@ -512,12 +514,11 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc, } void -bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf) +bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf) { - if (in_interrupt()) - BUG(); + BUG_ON(in_interrupt()); videobuf_waiton(&buf->vb,0,0); - videobuf_dma_pci_unmap(btv->c.pci, &buf->vb.dma); + videobuf_dma_unmap(q, &buf->vb.dma); videobuf_dma_free(&buf->vb.dma); btcx_riscmem_free(btv->c.pci,&buf->bottom); btcx_riscmem_free(btv->c.pci,&buf->top); |