---

yaml --- r: 366870 b: refs/heads/master c: 106cf64 h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 83c684d · 83c684d
1 parent a2e1f77
commit 83c684d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea86968fb91471493ccac7d8f2a65bc65db6803b
+refs/heads/master: 106cf649d06c55b881cf4eadf2ca1a28a04d93aa
diff --git a/trunk/drivers/media/v4l2-core/tuner-core.c b/trunk/drivers/media/v4l2-core/tuner-core.c
@@ -253,7 +253,7 @@ static int fe_set_config(struct dvb_frontend *fe, void *priv_cfg)
 
 static void tuner_status(struct dvb_frontend *fe);
 
-static struct analog_demod_ops tuner_analog_ops = {
+static const struct analog_demod_ops tuner_analog_ops = {
 	.set_params     = fe_set_params,
 	.standby        = fe_standby,
 	.has_signal     = fe_has_signal,
@@ -453,6 +453,11 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		memcpy(analog_ops, &tuner_analog_ops,
 		       sizeof(struct analog_demod_ops));
 
+		if (fe_tuner_ops->get_rf_strength == NULL)
+			analog_ops->has_signal = NULL;
+		if (fe_tuner_ops->get_afc == NULL)
+			analog_ops->get_afc = NULL;
+
 	} else {
 		t->name = analog_ops->info.name;
 	}