aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorVladimir Ermakov <vooon341@gmail.com>2010-04-07 02:23:31 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:56:43 -0300
commite838326312bbacd6c320113711e2662568d4fc6c (patch)
treecb90b60c4932368800b0b680a3369a841ca1c081 /drivers/media/video
parente20144770f5a119516f93959eca9818fa5ff065e (diff)
downloadkernel_samsung_smdk4412-e838326312bbacd6c320113711e2662568d4fc6c.zip
kernel_samsung_smdk4412-e838326312bbacd6c320113711e2662568d4fc6c.tar.gz
kernel_samsung_smdk4412-e838326312bbacd6c320113711e2662568d4fc6c.tar.bz2
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>
Diffstat (limited to 'drivers/media/video')
-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 655068f..b937d4d 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[] = {
.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 ae17b85..c8c1c9a 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)
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: