V4L/DVB: saa7134: fix GPIO HW-404M7

Signed-off-by: Vladimir Ermakov <vooon341@gmail.com>
Reviewed-by: hermann pitton <hermann-pitton@arcor.de>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 655068f6c49173f2d96cf583ceb084f7d6b19e69..b937d4da31361a6234a407149ab5a5953aceb56d 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5364,12 +5364,12 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type    = UNSET,
                .tuner_addr   = ADDR_UNSET,
                .radio_addr   = ADDR_UNSET,
-               .gpiomask      = 0x01fc00,
+               .gpiomask      = 0x389c00,
                .inputs       = {{
                        .name = name_comp1,
                        .vmux = 3,
                        .amux = LINE1,
-                       .gpio = 0x389c00,
+                       .gpio = 0x01fc00,
                } },
        },
 

diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index ae17b853f95722d1ef298e4b95c2520b8c3f29b6..c8c1c9ae6a7993f61b63df6ca5a6808be9f58036 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -607,7 +607,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
        switch (dev->board) {
        case SAA7134_BOARD_FLYVIDEO2000:
        case SAA7134_BOARD_FLYVIDEO3000:
-       case SAA7134_BOARD_HAWELL_HW_404M7:
        case SAA7134_BOARD_FLYTVPLATINUM_FM:
        case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
        case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: