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>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index e9834c159aecd225a2e8cd8f829301f0a3f67778..fc589070ef69bcc580d3219a9763adc79a233f93 100644 (file)
--- 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 6ca8631bc36dc98cf97c65c68bb5f20a1acb3334..5b6cece37aee9bebcd629f9b76474fd8190d7b96 100644 (file)
--- 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);
        }
 

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 520f274c89e5b12c3b4a124920ea4662850db3bf..4a660a4228b9b13901e7833cf83a5af8f02739d0 100644 (file)
--- 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,
        }
 
        t->type = type;
-
        switch (t->type) {
        case TUNER_MT2032:
                microtune_init(c);