V4L/DVB (3292): Fixed xc3028 firmware extractor, added terratec fw support

Fixed xc3028 firmware extractor for terratec's emBDA.sys firmware
Fixed delay in firmwareupload, now terratec's firmware also works

Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 1 insertions, 2 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[] = {
                 .vchannels    = 3,
                 .norm         = VIDEO_MODE_PAL,
                 .tda9887_conf = TDA9887_PRESENT,
-                .tuner_type   = TUNER_XCEIVE_XC3028,
                 .has_tuner    = 1,
+                .tuner_type   = TUNER_XCEIVE_XC3028,
                 .decoder      = EM28XX_TVP5150,
                 .input          = {{
                         .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)
                 tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
                 tun_setup.type = dev->tuner_type;
                 tun_setup.addr = dev->tuner_addr;
-
                 em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
         }