aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 22d1aefc0bf9..c3293d8eb33b 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -250,18 +250,18 @@ static struct tda18271_config hauppauge_hvr1210_tuner_config = {
250 .gate = TDA18271_GATE_DIGITAL, 250 .gate = TDA18271_GATE_DIGITAL,
251}; 251};
252 252
253static struct tda18271_std_map hcw_lgdt3305_tda18271_std_map = { 253static struct tda18271_std_map hauppauge_hvr127x_std_map = {
254 .atsc_6 = { .if_freq = 3250, .agc_mode = 3, .std = 4, 254 .atsc_6 = { .if_freq = 3250, .agc_mode = 3, .std = 4,
255 .if_lvl = 1, .rfagc_top = 0x58 }, 255 .if_lvl = 1, .rfagc_top = 0x58 },
256 .qam_6 = { .if_freq = 4000, .agc_mode = 3, .std = 5, 256 .qam_6 = { .if_freq = 4000, .agc_mode = 3, .std = 5,
257 .if_lvl = 1, .rfagc_top = 0x58 }, 257 .if_lvl = 1, .rfagc_top = 0x58 },
258}; 258};
259 259
260static struct tda18271_config hcw_lgdt3305_tda18271_config = { 260static struct tda18271_config hauppauge_hvr127x_config = {
261 .std_map = &hcw_lgdt3305_tda18271_std_map, 261 .std_map = &hauppauge_hvr127x_std_map,
262}; 262};
263 263
264static struct lgdt3305_config hcw_lgdt3305_config = { 264static struct lgdt3305_config hauppauge_lgdt3305_config = {
265 .i2c_addr = 0x0e, 265 .i2c_addr = 0x0e,
266 .mpeg_mode = LGDT3305_MPEG_SERIAL, 266 .mpeg_mode = LGDT3305_MPEG_SERIAL,
267 .tpclk_edge = LGDT3305_TPCLK_FALLING_EDGE, 267 .tpclk_edge = LGDT3305_TPCLK_FALLING_EDGE,
@@ -448,12 +448,12 @@ static int dvb_register(struct cx23885_tsport *port)
448 case CX23885_BOARD_HAUPPAUGE_HVR1275: 448 case CX23885_BOARD_HAUPPAUGE_HVR1275:
449 i2c_bus = &dev->i2c_bus[0]; 449 i2c_bus = &dev->i2c_bus[0];
450 fe0->dvb.frontend = dvb_attach(lgdt3305_attach, 450 fe0->dvb.frontend = dvb_attach(lgdt3305_attach,
451 &hcw_lgdt3305_config, 451 &hauppauge_lgdt3305_config,
452 &i2c_bus->i2c_adap); 452 &i2c_bus->i2c_adap);
453 if (fe0->dvb.frontend != NULL) { 453 if (fe0->dvb.frontend != NULL) {
454 dvb_attach(tda18271_attach, fe0->dvb.frontend, 454 dvb_attach(tda18271_attach, fe0->dvb.frontend,
455 0x60, &dev->i2c_bus[1].i2c_adap, 455 0x60, &dev->i2c_bus[1].i2c_adap,
456 &hcw_lgdt3305_tda18271_config); 456 &hauppauge_hvr127x_config);
457 } 457 }
458 break; 458 break;
459 case CX23885_BOARD_HAUPPAUGE_HVR1255: 459 case CX23885_BOARD_HAUPPAUGE_HVR1255: