2 files changed, 34 insertions, 8 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:
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/common/tuners/tea5761.c
index 925399dffbed..bf78cb9fc52c 100644
--- a/drivers/media/common/tuners/tea5761.c
+++ b/drivers/media/common/tuners/tea5761.c
@@ -23,6 +23,7 @@ struct tea5761_priv {
         struct tuner_i2c_props i2c_props;
 
         u32 frequency;
+        bool standby;
 };
 
 /*****************************************************************************/
@@ -135,18 +136,19 @@ static void tea5761_status_dump(unsigned char *buffer)
 }
 
 /* Freq should be specifyed at 62.5 Hz */
-static int set_radio_freq(struct dvb_frontend *fe,
-                          struct analog_parameters *params)
+static int __set_radio_freq(struct dvb_frontend *fe,
+                            unsigned int freq,
+                            bool mono)
 {
         struct tea5761_priv *priv = fe->tuner_priv;
-        unsigned int frq = params->frequency;
+        unsigned int frq = freq;
         unsigned char buffer[7] = {0, 0, 0, 0, 0, 0, 0 };
         unsigned div;
         int rc;
 
         tuner_dbg("radio freq counter %d\n", frq);
 
-        if (params->mode == T_STANDBY) {
+        if (priv->standby) {
                 tuner_dbg("TEA5761 set to standby mode\n");
                 buffer[5] |= TEA5761_TNCTRL_MU;
         } else {
@@ -154,7 +156,7 @@ static int set_radio_freq(struct dvb_frontend *fe,
         }
 
 
-        if (params->audmode == V4L2_TUNER_MODE_MONO) {
+        if (mono) {
                 tuner_dbg("TEA5761 set to mono\n");
                 buffer[5] |= TEA5761_TNCTRL_MST;
         } else {
@@ -176,6 +178,26 @@ static int set_radio_freq(struct dvb_frontend *fe,
         return 0;
 }
 
+static int set_radio_freq(struct dvb_frontend *fe,
+                          struct analog_parameters *params)
+{
+        struct tea5761_priv *priv = fe->analog_demod_priv;
+
+        priv->standby = false;
+
+        return __set_radio_freq(fe, params->frequency,
+                                params->audmode == V4L2_TUNER_MODE_MONO);
+}
+
+static int set_radio_sleep(struct dvb_frontend *fe)
+{
+        struct tea5761_priv *priv = fe->analog_demod_priv;
+
+        priv->standby = true;
+
+        return __set_radio_freq(fe, priv->frequency, false);
+}
+
 static int tea5761_read_status(struct dvb_frontend *fe, char *buffer)
 {
         struct tea5761_priv *priv = fe->tuner_priv;
@@ -284,6 +306,7 @@ static struct dvb_tuner_ops tea5761_tuner_ops = {
                 .name           = "tea5761", // Philips TEA5761HN FM Radio
         },
         .set_analog_params = set_radio_freq,
+        .sleep             = set_radio_sleep,
         .release           = tea5761_release,
         .get_frequency     = tea5761_get_frequency,
         .get_status        = tea5761_get_status,