commit 6b3ccab75ce082f7d63a43903ebd75da4266f77e
author Andrew de Quincey <adq_dvb@lidskialf.net> Thu Apr 20 12:01:47 2006 -0300
committer Mauro Carvalho Chehab <mchehab@infradead.org> Sun Jun 25 01:59:38 2006 -0300
tree 866d08667706310aaf7151a9802595fb44a7b63f
parent 159f8a6eda8c2ee359bb87bf62be70da2da14918

V4L/DVB (3895): Additional frontend_init safety checks

Don't try and set the tuner ops if the demod was not detected.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

drivers/media/dvb/ttpci/av7110.c

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 939a493..5f976d5 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2083,7 +2083,9 @@
 		case 0x0000: // Fujitsu/Siemens DVB-Cable (ves1820/Philips CD1516(??))
 			av7110->fe = ves1820_attach(&philips_cd1516_config,
 						    &av7110->i2c_adap, read_pwm(av7110));
-			av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+			if (av7110->fe) {
+				av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+			}
 			break;
 		}
 
@@ -2134,13 +2136,17 @@
 				/* Siemens DVB-C (full-length card) VES1820/Philips CD1516 */
 				av7110->fe = ves1820_attach(&philips_cd1516_config, &av7110->i2c_adap,
 							read_pwm(av7110));
-				av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+				if (av7110->fe) {
+					av7110->fe->ops->tuner_ops.set_params = philips_cd1516_tuner_set_params;
+				}
 				break;
 			case 0x0003:
 				/* Hauppauge DVB-C 2.1 VES1820/ALPS TDBE2 */
 				av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap,
 							read_pwm(av7110));
-				av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+				if (av7110->fe) {
+					av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+				}
 				break;
 			}
 			break;
@@ -2149,13 +2155,17 @@
 
 			// ALPS TDLB7
 			av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
-			av7110->fe->ops->tuner_ops.set_params = alps_tdlb7_tuner_set_params;
+			if (av7110->fe) {
+				av7110->fe->ops->tuner_ops.set_params = alps_tdlb7_tuner_set_params;
+			}
 			break;
 
 		case 0x0002: // Hauppauge/TT DVB-C premium rev2.X
 
 			av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
-			av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+			if (av7110->fe) {
+				av7110->fe->ops->tuner_ops.set_params = alps_tdbe2_tuner_set_params;
+			}
 			break;
 
 		case 0x0004: // Galaxis DVB-S rev1.3
@@ -2185,7 +2195,9 @@
 		case 0x0008: // Hauppauge/TT DVB-T
 
 			av7110->fe = l64781_attach(&grundig_29504_401_config, &av7110->i2c_adap);
-			av7110->fe->ops->tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+			if (av7110->fe) {
+				av7110->fe->ops->tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+			}
 			break;
 
 		case 0x000A: // Hauppauge/TT Nexus-CA rev1.X