diff options
-rw-r--r-- | drivers/media/video/tda8290.c | 8 | ||||
-rw-r--r-- | drivers/media/video/tda9887.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c index 3e593a3d9031..55bc89a6f069 100644 --- a/drivers/media/video/tda8290.c +++ b/drivers/media/video/tda8290.c | |||
@@ -645,9 +645,6 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props) | |||
645 | } | 645 | } |
646 | 646 | ||
647 | static struct analog_demod_ops tda8290_ops = { | 647 | static struct analog_demod_ops tda8290_ops = { |
648 | .info = { | ||
649 | .name = "TDA8290", | ||
650 | }, | ||
651 | .set_params = tda8290_set_params, | 648 | .set_params = tda8290_set_params, |
652 | .has_signal = tda8290_has_signal, | 649 | .has_signal = tda8290_has_signal, |
653 | .standby = tda8290_standby, | 650 | .standby = tda8290_standby, |
@@ -656,9 +653,6 @@ static struct analog_demod_ops tda8290_ops = { | |||
656 | }; | 653 | }; |
657 | 654 | ||
658 | static struct analog_demod_ops tda8295_ops = { | 655 | static struct analog_demod_ops tda8295_ops = { |
659 | .info = { | ||
660 | .name = "TDA8295", | ||
661 | }, | ||
662 | .set_params = tda8295_set_params, | 656 | .set_params = tda8295_set_params, |
663 | .has_signal = tda8295_has_signal, | 657 | .has_signal = tda8295_has_signal, |
664 | .standby = tda8295_standby, | 658 | .standby = tda8295_standby, |
@@ -731,6 +725,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, | |||
731 | } | 725 | } |
732 | tuner_info("type set to %s\n", name); | 726 | tuner_info("type set to %s\n", name); |
733 | 727 | ||
728 | fe->ops.analog_ops.info.name = name; | ||
729 | |||
734 | if (priv->ver & TDA8290) { | 730 | if (priv->ver & TDA8290) { |
735 | tda8290_init_tuner(fe); | 731 | tda8290_init_tuner(fe); |
736 | tda8290_init_if(fe); | 732 | tda8290_init_if(fe); |
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index d3aabe2d146b..106c93b8203f 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
@@ -650,7 +650,7 @@ static void tda9887_release(struct dvb_frontend *fe) | |||
650 | 650 | ||
651 | static struct analog_demod_ops tda9887_ops = { | 651 | static struct analog_demod_ops tda9887_ops = { |
652 | .info = { | 652 | .info = { |
653 | .name = "TDA9887", | 653 | .name = "tda9887", |
654 | }, | 654 | }, |
655 | .set_params = tda9887_set_params, | 655 | .set_params = tda9887_set_params, |
656 | .standby = tda9887_standby, | 656 | .standby = tda9887_standby, |