diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:17:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:17:11 -0300 |
| commit | 0b831dcdb633365e47049c9aa5f243cce99569e5 (patch) | |
| tree | 1f4adac3c92c3e671217e22f1dcb63423104aad9 /linux/drivers/media/video/cx88 | |
| parent | 8dedcbf12153e737c57c521a6fbf108e6f9e81d8 (diff) | |
| download | mediapointer-dvb-s2-0b831dcdb633365e47049c9aa5f243cce99569e5.tar.gz mediapointer-dvb-s2-0b831dcdb633365e47049c9aa5f243cce99569e5.tar.bz2 | |
BUG_ON() Conversion in drivers/video/media
From: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 24acfa2bd..e8bf7cf7c 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -232,8 +232,7 @@ int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc, void cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf) { - if (in_interrupt()) - BUG(); + BUG_ON(in_interrupt()); videobuf_waiton(&buf->vb,0,0); videobuf_dma_pci_unmap(pci, &buf->vb.dma); videobuf_dma_free(&buf->vb.dma); diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 79126bc5c..4484744bc 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -392,8 +392,7 @@ static void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits) { struct cx88_core *core = dev->core; - if ((fh->resources & bits) != bits) - BUG(); + BUG_ON((fh->resources & bits) != bits); mutex_lock(&core->lock); fh->resources &= ~bits; |