aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Ermakov <vooon341@gmail.com>2010-04-07 01:23:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:56:43 -0400
commite838326312bbacd6c320113711e2662568d4fc6c (patch)
treecb90b60c4932368800b0b680a3369a841ca1c081
parente20144770f5a119516f93959eca9818fa5ff065e (diff)
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>
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 655068f6c491..b937d4da3136 100644
--- 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[] = {
5364 .radio_type = UNSET, 5364 .radio_type = UNSET,
5365 .tuner_addr = ADDR_UNSET, 5365 .tuner_addr = ADDR_UNSET,
5366 .radio_addr = ADDR_UNSET, 5366 .radio_addr = ADDR_UNSET,
5367 .gpiomask = 0x01fc00, 5367 .gpiomask = 0x389c00,
5368 .inputs = {{ 5368 .inputs = {{
5369 .name = name_comp1, 5369 .name = name_comp1,
5370 .vmux = 3, 5370 .vmux = 3,
5371 .amux = LINE1, 5371 .amux = LINE1,
5372 .gpio = 0x389c00, 5372 .gpio = 0x01fc00,
5373 } }, 5373 } },
5374 }, 5374 },
5375 5375
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index ae17b853f957..c8c1c9ae6a79 100644
--- 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)
607 switch (dev->board) { 607 switch (dev->board) {
608 case SAA7134_BOARD_FLYVIDEO2000: 608 case SAA7134_BOARD_FLYVIDEO2000:
609 case SAA7134_BOARD_FLYVIDEO3000: 609 case SAA7134_BOARD_FLYVIDEO3000:
610 case SAA7134_BOARD_HAWELL_HW_404M7:
611 case SAA7134_BOARD_FLYTVPLATINUM_FM: 610 case SAA7134_BOARD_FLYTVPLATINUM_FM:
612 case SAA7134_BOARD_FLYTVPLATINUM_MINI2: 611 case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
613 case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: 612 case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: