Commit 0e236e0a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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



No need for BUG_ON, WARN_ON is a lot friendlier.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 40e986c9
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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);
+2 −1
Original line number Diff line number Diff line
@@ -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;