diff options
Diffstat (limited to 'drivers/media/common/tuners/tda9887.c')
-rw-r--r-- | drivers/media/common/tuners/tda9887.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c index bf14bd79e2fc..cdb645d57438 100644 --- a/drivers/media/common/tuners/tda9887.c +++ b/drivers/media/common/tuners/tda9887.c | |||
@@ -36,6 +36,8 @@ struct tda9887_priv { | |||
36 | unsigned int mode; | 36 | unsigned int mode; |
37 | unsigned int audmode; | 37 | unsigned int audmode; |
38 | v4l2_std_id std; | 38 | v4l2_std_id std; |
39 | |||
40 | bool standby; | ||
39 | }; | 41 | }; |
40 | 42 | ||
41 | /* ---------------------------------------------------------------------- */ | 43 | /* ---------------------------------------------------------------------- */ |
@@ -568,7 +570,7 @@ static void tda9887_configure(struct dvb_frontend *fe) | |||
568 | tda9887_do_config(fe); | 570 | tda9887_do_config(fe); |
569 | tda9887_set_insmod(fe); | 571 | tda9887_set_insmod(fe); |
570 | 572 | ||
571 | if (priv->mode == T_STANDBY) | 573 | if (priv->standby) |
572 | priv->data[1] |= cForcedMuteAudioON; | 574 | priv->data[1] |= cForcedMuteAudioON; |
573 | 575 | ||
574 | tuner_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n", | 576 | tuner_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n", |
@@ -616,7 +618,7 @@ static void tda9887_standby(struct dvb_frontend *fe) | |||
616 | { | 618 | { |
617 | struct tda9887_priv *priv = fe->analog_demod_priv; | 619 | struct tda9887_priv *priv = fe->analog_demod_priv; |
618 | 620 | ||
619 | priv->mode = T_STANDBY; | 621 | priv->standby = true; |
620 | 622 | ||
621 | tda9887_configure(fe); | 623 | tda9887_configure(fe); |
622 | } | 624 | } |
@@ -626,6 +628,7 @@ static void tda9887_set_params(struct dvb_frontend *fe, | |||
626 | { | 628 | { |
627 | struct tda9887_priv *priv = fe->analog_demod_priv; | 629 | struct tda9887_priv *priv = fe->analog_demod_priv; |
628 | 630 | ||
631 | priv->standby = false; | ||
629 | priv->mode = params->mode; | 632 | priv->mode = params->mode; |
630 | priv->audmode = params->audmode; | 633 | priv->audmode = params->audmode; |
631 | priv->std = params->std; | 634 | priv->std = params->std; |
@@ -686,7 +689,7 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe, | |||
686 | return NULL; | 689 | return NULL; |
687 | case 1: | 690 | case 1: |
688 | fe->analog_demod_priv = priv; | 691 | fe->analog_demod_priv = priv; |
689 | priv->mode = T_STANDBY; | 692 | priv->standby = true; |
690 | tuner_info("tda988[5/6/7] found\n"); | 693 | tuner_info("tda988[5/6/7] found\n"); |
691 | break; | 694 | break; |
692 | default: | 695 | default: |