summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci/av7110.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-14 12:12:39 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-14 12:12:39 -0300
commit1c56b8f4079af9413ea15f420259e97187a3bf7a (patch)
tree42a3f1eb4a419e49badcc1ce966120f6a88a1fe1 /linux/drivers/media/dvb/ttpci/av7110.c
parente07574e1290ffc63432bc2b06a7677abc365de2d (diff)
parent0b831dcdb633365e47049c9aa5f243cce99569e5 (diff)
downloadmediapointer-dvb-s2-1c56b8f4079af9413ea15f420259e97187a3bf7a.tar.gz
mediapointer-dvb-s2-1c56b8f4079af9413ea15f420259e97187a3bf7a.tar.bz2
Snd_cx88_create: don't dereference NULL core
From: Duncan Sands <duncan.sands@math.u-psud.fr> If the call to cx88_core_get returns a NULL value, it is dereferenced by cx88_reset, and perhaps by cx88_core_put. Spotted by the Coverity checker. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.c')
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 56492926a..106022c39 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/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);
@@ -1441,7 +1439,7 @@ static int check_firmware(struct av7110* av7110)
len = ntohl(*(u32*) ptr);
ptr += 4;
if (len >= 512) {
- printk("dvb-ttpci: dpram file is way to big.\n");
+ printk("dvb-ttpci: dpram file is way too big.\n");
return -EINVAL;
}
if (crc != crc32_le(0, ptr, len)) {