V4L/DVB (4936): Make MT4049FM5 tuner to set FM Gain to Normal

- remove any specific TDA9887_SET_CONFIG of usbvision driver
- add fm_gain_normal=1 to the MT4049FM5 tuner for radio functionality

Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index 1256c64..74c3e6f 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -651,6 +651,7 @@
 		.has_tda9887 = 1,
 		.port1_invert_for_secam_lc = 1,
 		.default_pll_gating_18 = 1,
+		.fm_gain_normal=1,
 	},
 };
 
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index b5aa318..0eb3ddc 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2585,14 +2585,12 @@
 		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;
 		}