From ac75c737310b4fe08244c4e9521fffa6718536a1 Mon Sep 17 00:00:00 2001 From: Thierry MERLE Date: Mon, 4 Dec 2006 08:31:42 -0300 Subject: [PATCH] --- yaml --- r: 44135 b: refs/heads/master c: d8159a3684007e0ded915cb7465c9534a2650c53 h: refs/heads/master i: 44133: c90b992677178669967cc2259e0860ba9a442c8a 44131: 96b21535fb36a84103432d955faf21d6b73664ac 44127: e63348ec79fad4d9234bfb3f4de2607ba91612a2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-types.c | 1 + trunk/drivers/media/video/usbvision/usbvision-core.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f6d0774ce478..bdb9c35d7ec7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 483deb0f2b38060c1f2de216c09f05b1869b0d52 +refs/heads/master: d8159a3684007e0ded915cb7465c9534a2650c53 diff --git a/trunk/drivers/media/video/tuner-types.c b/trunk/drivers/media/video/tuner-types.c index 1256c64af4db..74c3e6f96f1a 100644 --- a/trunk/drivers/media/video/tuner-types.c +++ b/trunk/drivers/media/video/tuner-types.c @@ -651,6 +651,7 @@ static struct tuner_params tuner_microtune_4049_fm5_params[] = { .has_tda9887 = 1, .port1_invert_for_secam_lc = 1, .default_pll_gating_18 = 1, + .fm_gain_normal=1, }, }; diff --git a/trunk/drivers/media/video/usbvision/usbvision-core.c b/trunk/drivers/media/video/usbvision/usbvision-core.c index b5aa3185402d..0eb3ddcd0f3e 100644 --- a/trunk/drivers/media/video/usbvision/usbvision-core.c +++ b/trunk/drivers/media/video/usbvision/usbvision-core.c @@ -2585,14 +2585,12 @@ 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; }