media: staging: media: av7110: replace BUG_ON by WARN_ON

No need for BUG_ON, WARN_ON is a lot friendlier.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c
index df81a9b744c2061f22bdb764c855fc71cbaceaf6..a5a431c14ea78bf0640e323cea2315b59d5b0cd7 100644 (file)
--- a/drivers/staging/media/av7110/av7110.c
+++ b/drivers/staging/media/av7110/av7110.c
@@ -1106,9 +1106,11 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
        struct av7110 *av7110;
 
        /* pointer casting paranoia... */
-       BUG_ON(!demux);
+       if (WARN_ON(!demux))
+               return -EIO;
        dvbdemux = demux->priv;
-       BUG_ON(!dvbdemux);
+       if (WARN_ON(!dvbdemux))
+               return -EIO;
        av7110 = dvbdemux->priv;
 
        dprintk(4, "%p\n", av7110);

diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c
index 93ca31e38ddd3949169ee0b1f11eb41ae2f58c9c..a0be377172596e0bb7d51fd87b2e88072ef831b3 100644 (file)
--- a/drivers/staging/media/av7110/av7110_hw.c
+++ b/drivers/staging/media/av7110/av7110_hw.c
@@ -1007,7 +1007,8 @@ static int OSDSetBlock(struct av7110 *av7110, int x0, int y0,
 
        if (av7110->bmp_state == BMP_LOADING) {
                /* possible if syscall is repeated by -ERESTARTSYS and if firmware cannot abort */
-               BUG_ON (FW_VERSION(av7110->arm_app) >= 0x261e);
+               if (WARN_ON(FW_VERSION(av7110->arm_app) >= 0x261e))
+                       return -EIO;
                rc = WaitUntilBmpLoaded(av7110);
                if (rc)
                        return rc;