V4L/DVB (4934): Usbvision radio requires GainNormal at e register

Adds an option to select GainNormal at tda9887 and make usbvision
to use it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 87ffb0e84a7a..fde576f1101c 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -482,6 +482,12 @@ static int tda9887_set_config(struct tuner *t, char *buf)
                 buf[1] &= ~cQSS;
         if (t->tda9887_config & TDA9887_GATING_18)
                 buf[3] &= ~cGating_36;
+
+        if (t->tda9887_config & TDA9887_GAIN_NORMAL) {
+                radio_stereo.e &= ~cTunerGainLow;
+                radio_mono.e &= ~cTunerGainLow;
+        }
+
         return 0;
 }
 
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 0365c7f93972..b5aa3185402d 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2585,12 +2585,15 @@ static int attach_inform(struct i2c_client *client)
                 case 0x4b:
                 {
                         struct tuner_setup tun_setup;
+                        unsigned int tda9887_conf = TDA9887_GAIN_NORMAL;
 
                         tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
                         tun_setup.type = TUNER_TDA9887;
                         tun_setup.addr = client->addr;
 
                         call_i2c_clients(usbvision, TUNER_SET_TYPE_ADDR, &tun_setup);
+                        call_i2c_clients(usbvision,TDA9887_SET_CONFIG, &tda9887_conf);
+
                         break;
                 }
                 case 0x42: