summaryrefslogtreecommitdiffstats
path: root/drivers/media/common/tuners/tda9887.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2011-02-14 21:53:12 +0100
committerMauro Carvalho Chehab2011-03-22 00:32:03 +0100
commit2d351df443b0b324a440b5fd053074562d36a7f5 (patch)
tree911ffeb44059127e4524898bddfc82cb50822fb5 /drivers/media/common/tuners/tda9887.c
parent[media] tuner-core: Fix a few comments on it (diff)
downloadkernel-qcow2-linux-2d351df443b0b324a440b5fd053074562d36a7f5.tar.gz
kernel-qcow2-linux-2d351df443b0b324a440b5fd053074562d36a7f5.tar.xz
kernel-qcow2-linux-2d351df443b0b324a440b5fd053074562d36a7f5.zip
[media] Remove the remaining usages for T_STANDBY
tda9887 used to use the T_STANDBY type internally, while tea5761 used it to put the device to sleep. Fix the code for it to work properly with the tuner core changes and remove this flag from tuner.h. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/tuners/tda9887.c')
-rw-r--r--drivers/media/common/tuners/tda9887.c9
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 {
unsigned int mode;
unsigned int audmode;
v4l2_std_id std;
+
+ bool standby;
};
/* ---------------------------------------------------------------------- */
@@ -568,7 +570,7 @@ static void tda9887_configure(struct dvb_frontend *fe)
tda9887_do_config(fe);
tda9887_set_insmod(fe);
- if (priv->mode == T_STANDBY)
+ if (priv->standby)
priv->data[1] |= cForcedMuteAudioON;
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)
{
struct tda9887_priv *priv = fe->analog_demod_priv;
- priv->mode = T_STANDBY;
+ priv->standby = true;
tda9887_configure(fe);
}
@@ -626,6 +628,7 @@ static void tda9887_set_params(struct dvb_frontend *fe,
{
struct tda9887_priv *priv = fe->analog_demod_priv;
+ priv->standby = false;
priv->mode = params->mode;
priv->audmode = params->audmode;
priv->std = params->std;
@@ -686,7 +689,7 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
return NULL;
case 1:
fe->analog_demod_priv = priv;
- priv->mode = T_STANDBY;
+ priv->standby = true;
tuner_info("tda988[5/6/7] found\n");
break;
default: