aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bttv-risc.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-13 13:17:11 -0300
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-21 08:53:19 -0800
commitae24601b47c3f4a56545ef4cd4e7c821ac1db598 (patch)
tree562258e9fdec32a9b7410a8467dc5315bdbfe8c3 /drivers/media/video/bttv-risc.c
parent9d9d6baeca6f9174b8e7fd219a62a8fa09d61cc7 (diff)
downloadkernel_samsung_smdk4412-ae24601b47c3f4a56545ef4cd4e7c821ac1db598.zip
kernel_samsung_smdk4412-ae24601b47c3f4a56545ef4cd4e7c821ac1db598.tar.gz
kernel_samsung_smdk4412-ae24601b47c3f4a56545ef4cd4e7c821ac1db598.tar.bz2
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bttv-risc.c
index 5c74611..344f84e 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,
void
bttv_dma_free(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_free(&buf->vb.dma);