aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-22 13:46:10 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:53 -0400
commit0be51b4671b3ae3ae544a0bb3d15b55478b55e72 (patch)
tree0de42232dc985bfa3d2e9490be89b870702880ff /drivers/media/video/saa7134/saa7134-cards.c
parent0fea03fbd3aeaa9b4a4de8409e5ef3aca43a6d0b (diff)
V4L/DVB (7398): Adds an error if priv argument of tuner_callback is NULL
Adds a consistency check to avoid OOPS, if tuner_callback priv argument is NULL. Also, simplifies callback codes on cx88. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index b622d979e634..c323ca005f72 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5266,6 +5266,9 @@ int saa7134_tuner_callback(void *priv, int command, int arg)
5266 case TUNER_XC2028: 5266 case TUNER_XC2028:
5267 return saa7134_xc2028_callback(dev, command, arg); 5267 return saa7134_xc2028_callback(dev, command, arg);
5268 } 5268 }
5269 } else {
5270 printk(KERN_ERR "saa7134: Error - device struct undefined.\n");
5271 return -EINVAL;
5269 } 5272 }
5270 return -EINVAL; 5273 return -EINVAL;
5271} 5274}