diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index c95438abcd7b..c20c07117537 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -611,12 +611,12 @@ struct cx88_board cx88_boards[] = { | |||
611 | .input = {{ | 611 | .input = {{ |
612 | .type = CX88_VMUX_TELEVISION, | 612 | .type = CX88_VMUX_TELEVISION, |
613 | .vmux = 0, | 613 | .vmux = 0, |
614 | .gpio0 = 0xed12, /* internal decoder */ | 614 | .gpio0 = 0xed1a, |
615 | .gpio2 = 0x00ff, | 615 | .gpio2 = 0x00ff, |
616 | },{ | 616 | },{ |
617 | .type = CX88_VMUX_DEBUG, | 617 | .type = CX88_VMUX_DEBUG, |
618 | .vmux = 0, | 618 | .vmux = 0, |
619 | .gpio0 = 0xff01, /* mono from tuner chip */ | 619 | .gpio0 = 0xff01, |
620 | },{ | 620 | },{ |
621 | .type = CX88_VMUX_COMPOSITE1, | 621 | .type = CX88_VMUX_COMPOSITE1, |
622 | .vmux = 1, | 622 | .vmux = 1, |
@@ -1202,11 +1202,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) | |||
1202 | 1202 | ||
1203 | tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data); | 1203 | tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data); |
1204 | core->tuner_type = tv.tuner_type; | 1204 | core->tuner_type = tv.tuner_type; |
1205 | core->tuner_formats = tv.tuner_formats; | ||
1205 | core->has_radio = tv.has_radio; | 1206 | core->has_radio = tv.has_radio; |
1206 | 1207 | ||
1207 | /* Make sure we support the board model */ | 1208 | /* Make sure we support the board model */ |
1208 | switch (tv.model) | 1209 | switch (tv.model) |
1209 | { | 1210 | { |
1211 | case 28552: /* WinTV-PVR 'Roslyn' (No IR) */ | ||
1210 | case 90002: /* Nova-T-PCI (9002) */ | 1212 | case 90002: /* Nova-T-PCI (9002) */ |
1211 | case 92001: /* Nova-S-Plus (Video and IR) */ | 1213 | case 92001: /* Nova-S-Plus (Video and IR) */ |
1212 | case 92002: /* Nova-S-Plus (Video and IR) */ | 1214 | case 92002: /* Nova-S-Plus (Video and IR) */ |