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>

2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 25be3a976d09..c2cdbafdb77b 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -215,8 +215,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/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index b1892dff0fe8..6c97aa740d27 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -366,8 +366,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;