diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-13 11:17:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:53:19 -0500 |
commit | ae24601b47c3f4a56545ef4cd4e7c821ac1db598 (patch) | |
tree | 562258e9fdec32a9b7410a8467dc5315bdbfe8c3 /drivers/media/video/bttv-risc.c | |
parent | 9d9d6baeca6f9174b8e7fd219a62a8fa09d61cc7 (diff) |
V4L/DVB (3485): BUG_ON() Conversion in drivers/video/media
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bttv-risc.c')
-rw-r--r-- | drivers/media/video/bttv-risc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bttv-risc.c index 5c746110df62..344f84e9af04 100644 --- a/drivers/media/video/bttv-risc.c +++ b/drivers/media/video/bttv-risc.c | |||
@@ -511,8 +511,7 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc, | |||
511 | void | 511 | void |
512 | bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf) | 512 | bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf) |
513 | { | 513 | { |
514 | if (in_interrupt()) | 514 | BUG_ON(in_interrupt()); |
515 | BUG(); | ||
516 | videobuf_waiton(&buf->vb,0,0); | 515 | videobuf_waiton(&buf->vb,0,0); |
517 | videobuf_dma_pci_unmap(btv->c.pci, &buf->vb.dma); | 516 | videobuf_dma_pci_unmap(btv->c.pci, &buf->vb.dma); |
518 | videobuf_dma_free(&buf->vb.dma); | 517 | videobuf_dma_free(&buf->vb.dma); |