2 files changed, 3 insertions, 6 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index aef4f58d712d..7497b1e8d883 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1090,11 +1090,9 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
         struct av7110 *av7110;
 
         /* pointer casting paranoia... */
-        if (!demux)
-                BUG();
+        BUG_ON(!demux);
         dvbdemux = (struct dvb_demux *) demux->priv;
-        if (!dvbdemux)
-                BUG();
+        BUG_ON(!dvbdemux);
         av7110 = (struct av7110 *) dvbdemux->priv;
 
         dprintk(4, "%p\n", av7110);
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index ecb15d4ecf81..248fdc7accfb 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -688,8 +688,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
                                 memcpy(ttusb->muxpack + ttusb->muxpack_ptr,
                                        data, avail);
                                 ttusb->muxpack_ptr += avail;
-                                if (ttusb->muxpack_ptr > 264)
-                                        BUG();
+                                BUG_ON(ttusb->muxpack_ptr > 264);
                                 data += avail;
                                 len -= avail;
                                 /* determine length */