diff options
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 1 | ||||
-rw-r--r-- | drivers/media/video/tuner-core.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index e9834c159aec..fc589070ef69 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -181,8 +181,8 @@ struct em28xx_board em28xx_boards[] = { | |||
181 | .vchannels = 3, | 181 | .vchannels = 3, |
182 | .norm = VIDEO_MODE_PAL, | 182 | .norm = VIDEO_MODE_PAL, |
183 | .tda9887_conf = TDA9887_PRESENT, | 183 | .tda9887_conf = TDA9887_PRESENT, |
184 | .tuner_type = TUNER_XCEIVE_XC3028, | ||
185 | .has_tuner = 1, | 184 | .has_tuner = 1, |
185 | .tuner_type = TUNER_XCEIVE_XC3028, | ||
186 | .decoder = EM28XX_TVP5150, | 186 | .decoder = EM28XX_TVP5150, |
187 | .input = {{ | 187 | .input = {{ |
188 | .type = EM28XX_VMUX_COMPOSITE1, | 188 | .type = EM28XX_VMUX_COMPOSITE1, |
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 6ca8631bc36d..5b6cece37aee 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -420,7 +420,6 @@ static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client) | |||
420 | tun_setup.mode_mask = T_ANALOG_TV | T_RADIO; | 420 | tun_setup.mode_mask = T_ANALOG_TV | T_RADIO; |
421 | tun_setup.type = dev->tuner_type; | 421 | tun_setup.type = dev->tuner_type; |
422 | tun_setup.addr = dev->tuner_addr; | 422 | tun_setup.addr = dev->tuner_addr; |
423 | |||
424 | em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup); | 423 | em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup); |
425 | } | 424 | } |
426 | 425 | ||
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 520f274c89e5..4a660a4228b9 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -173,7 +173,6 @@ static void set_type(struct i2c_client *c, unsigned int type, | |||
173 | } | 173 | } |
174 | 174 | ||
175 | t->type = type; | 175 | t->type = type; |
176 | |||
177 | switch (t->type) { | 176 | switch (t->type) { |
178 | case TUNER_MT2032: | 177 | case TUNER_MT2032: |
179 | microtune_init(c); | 178 | microtune_init(c); |