diff options
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/bt878.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/demux.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 8 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-init.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/mt312.c | 116 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/mt312.h | 6 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/stv0297.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 9 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_hw.c | 3 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 4 |
14 files changed, 67 insertions, 97 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c index 390cc3a99ce6..9c7f122826e0 100644 --- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c | |||
@@ -526,7 +526,7 @@ int flexcop_frontend_init(struct flexcop_device *fc) | |||
526 | info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address); | 526 | info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address); |
527 | } else | 527 | } else |
528 | /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ | 528 | /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ |
529 | if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) { | 529 | if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) { |
530 | ops = fc->fe->ops; | 530 | ops = fc->fe->ops; |
531 | 531 | ||
532 | ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd; | 532 | ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd; |
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index 34c3189a1a33..356f447ee2ab 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
@@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet * | |||
382 | EXPORT_SYMBOL(bt878_device_control); | 382 | EXPORT_SYMBOL(bt878_device_control); |
383 | 383 | ||
384 | 384 | ||
385 | struct cards card_list[] __devinitdata = { | 385 | static struct cards card_list[] __devinitdata = { |
386 | 386 | ||
387 | { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, | 387 | { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, |
388 | { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" }, | 388 | { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" }, |
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c index 3a2ff1cc24b7..0310e3dd07e6 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/dvb/bt8xx/dst.c | |||
@@ -602,7 +602,7 @@ static int dst_type_print(u8 type) | |||
602 | 602 | ||
603 | */ | 603 | */ |
604 | 604 | ||
605 | struct dst_types dst_tlist[] = { | 605 | static struct dst_types dst_tlist[] = { |
606 | { | 606 | { |
607 | .device_id = "200103A", | 607 | .device_id = "200103A", |
608 | .offset = 0, | 608 | .offset = 0, |
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h index 9f025825b2d2..0c1d87c5227a 100644 --- a/drivers/media/dvb/dvb-core/demux.h +++ b/drivers/media/dvb/dvb-core/demux.h | |||
@@ -216,7 +216,7 @@ struct dmx_frontend { | |||
216 | /*--------------------------------------------------------------------------*/ | 216 | /*--------------------------------------------------------------------------*/ |
217 | 217 | ||
218 | /* | 218 | /* |
219 | * Flags OR'ed in the capabilites field of struct dmx_demux. | 219 | * Flags OR'ed in the capabilities field of struct dmx_demux. |
220 | */ | 220 | */ |
221 | 221 | ||
222 | #define DMX_TS_FILTERING 1 | 222 | #define DMX_TS_FILTERING 1 |
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index f327fac1688e..162f9795cd89 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -282,7 +282,7 @@ static struct cx22702_config cxusb_cx22702_config = { | |||
282 | .pll_set = dvb_usb_pll_set_i2c, | 282 | .pll_set = dvb_usb_pll_set_i2c, |
283 | }; | 283 | }; |
284 | 284 | ||
285 | static struct lgdt330x_config cxusb_lgdt330x_config = { | 285 | static struct lgdt330x_config cxusb_lgdt3303_config = { |
286 | .demod_address = 0x0e, | 286 | .demod_address = 0x0e, |
287 | .demod_chip = LGDT3303, | 287 | .demod_chip = LGDT3303, |
288 | .pll_set = dvb_usb_pll_set_i2c, | 288 | .pll_set = dvb_usb_pll_set_i2c, |
@@ -357,14 +357,14 @@ static int cxusb_cx22702_frontend_attach(struct dvb_usb_device *d) | |||
357 | return -EIO; | 357 | return -EIO; |
358 | } | 358 | } |
359 | 359 | ||
360 | static int cxusb_lgdt330x_frontend_attach(struct dvb_usb_device *d) | 360 | static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_device *d) |
361 | { | 361 | { |
362 | if (usb_set_interface(d->udev,0,7) < 0) | 362 | if (usb_set_interface(d->udev,0,7) < 0) |
363 | err("set interface failed"); | 363 | err("set interface failed"); |
364 | 364 | ||
365 | cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0); | 365 | cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0); |
366 | 366 | ||
367 | if ((d->fe = lgdt330x_attach(&cxusb_lgdt330x_config, &d->i2c_adap)) != NULL) | 367 | if ((d->fe = lgdt330x_attach(&cxusb_lgdt3303_config, &d->i2c_adap)) != NULL) |
368 | return 0; | 368 | return 0; |
369 | 369 | ||
370 | return -EIO; | 370 | return -EIO; |
@@ -506,7 +506,7 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = { | |||
506 | 506 | ||
507 | .streaming_ctrl = cxusb_streaming_ctrl, | 507 | .streaming_ctrl = cxusb_streaming_ctrl, |
508 | .power_ctrl = cxusb_power_ctrl, | 508 | .power_ctrl = cxusb_power_ctrl, |
509 | .frontend_attach = cxusb_lgdt330x_frontend_attach, | 509 | .frontend_attach = cxusb_lgdt3303_frontend_attach, |
510 | .tuner_attach = cxusb_lgh064f_tuner_attach, | 510 | .tuner_attach = cxusb_lgh064f_tuner_attach, |
511 | 511 | ||
512 | .i2c_algo = &cxusb_i2c_algo, | 512 | .i2c_algo = &cxusb_i2c_algo, |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c index 716f8bf528cd..ce34a55e5c24 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c | |||
@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_device *d) | |||
47 | 47 | ||
48 | d->state = DVB_USB_STATE_INIT; | 48 | d->state = DVB_USB_STATE_INIT; |
49 | 49 | ||
50 | /* check the capabilites and set appropriate variables */ | 50 | /* check the capabilities and set appropriate variables */ |
51 | 51 | ||
52 | /* speed - when running at FULL speed we need a HW PID filter */ | 52 | /* speed - when running at FULL speed we need a HW PID filter */ |
53 | if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) { | 53 | if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) { |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 5e5d21ad93c9..d4909e5c67e0 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
@@ -87,7 +87,7 @@ struct dvb_usb_device; | |||
87 | 87 | ||
88 | /** | 88 | /** |
89 | * struct dvb_usb_properties - properties of a dvb-usb-device | 89 | * struct dvb_usb_properties - properties of a dvb-usb-device |
90 | * @caps: capabilites of the DVB USB device. | 90 | * @caps: capabilities of the DVB USB device. |
91 | * @pid_filter_count: number of PID filter position in the optional hardware | 91 | * @pid_filter_count: number of PID filter position in the optional hardware |
92 | * PID-filter. | 92 | * PID-filter. |
93 | * | 93 | * |
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig index 76b6a2aef32f..c676b1e23ab0 100644 --- a/drivers/media/dvb/frontends/Kconfig +++ b/drivers/media/dvb/frontends/Kconfig | |||
@@ -29,7 +29,7 @@ config DVB_TDA8083 | |||
29 | A DVB-S tuner module. Say Y when you want to support this frontend. | 29 | A DVB-S tuner module. Say Y when you want to support this frontend. |
30 | 30 | ||
31 | config DVB_MT312 | 31 | config DVB_MT312 |
32 | tristate "Zarlink MT312 based" | 32 | tristate "Zarlink VP310/MT312 based" |
33 | depends on DVB_CORE | 33 | depends on DVB_CORE |
34 | help | 34 | help |
35 | A DVB-S tuner module. Say Y when you want to support this frontend. | 35 | A DVB-S tuner module. Say Y when you want to support this frontend. |
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index ec4e641acc64..d3aea83cf218 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -612,76 +612,6 @@ static void mt312_release(struct dvb_frontend* fe) | |||
612 | kfree(state); | 612 | kfree(state); |
613 | } | 613 | } |
614 | 614 | ||
615 | static struct dvb_frontend_ops vp310_mt312_ops; | ||
616 | |||
617 | struct dvb_frontend* vp310_attach(const struct mt312_config* config, | ||
618 | struct i2c_adapter* i2c) | ||
619 | { | ||
620 | struct mt312_state* state = NULL; | ||
621 | |||
622 | /* allocate memory for the internal state */ | ||
623 | state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL); | ||
624 | if (state == NULL) | ||
625 | goto error; | ||
626 | |||
627 | /* setup the state */ | ||
628 | state->config = config; | ||
629 | state->i2c = i2c; | ||
630 | memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops)); | ||
631 | strcpy(state->ops.info.name, "Zarlink VP310 DVB-S"); | ||
632 | |||
633 | /* check if the demod is there */ | ||
634 | if (mt312_readreg(state, ID, &state->id) < 0) | ||
635 | goto error; | ||
636 | if (state->id != ID_VP310) { | ||
637 | goto error; | ||
638 | } | ||
639 | |||
640 | /* create dvb_frontend */ | ||
641 | state->frequency = 90; | ||
642 | state->frontend.ops = &state->ops; | ||
643 | state->frontend.demodulator_priv = state; | ||
644 | return &state->frontend; | ||
645 | |||
646 | error: | ||
647 | kfree(state); | ||
648 | return NULL; | ||
649 | } | ||
650 | |||
651 | struct dvb_frontend* mt312_attach(const struct mt312_config* config, | ||
652 | struct i2c_adapter* i2c) | ||
653 | { | ||
654 | struct mt312_state* state = NULL; | ||
655 | |||
656 | /* allocate memory for the internal state */ | ||
657 | state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL); | ||
658 | if (state == NULL) | ||
659 | goto error; | ||
660 | |||
661 | /* setup the state */ | ||
662 | state->config = config; | ||
663 | state->i2c = i2c; | ||
664 | memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops)); | ||
665 | strcpy(state->ops.info.name, "Zarlink MT312 DVB-S"); | ||
666 | |||
667 | /* check if the demod is there */ | ||
668 | if (mt312_readreg(state, ID, &state->id) < 0) | ||
669 | goto error; | ||
670 | if (state->id != ID_MT312) { | ||
671 | goto error; | ||
672 | } | ||
673 | |||
674 | /* create dvb_frontend */ | ||
675 | state->frequency = 60; | ||
676 | state->frontend.ops = &state->ops; | ||
677 | state->frontend.demodulator_priv = state; | ||
678 | return &state->frontend; | ||
679 | |||
680 | error: | ||
681 | kfree(state); | ||
682 | return NULL; | ||
683 | } | ||
684 | |||
685 | static struct dvb_frontend_ops vp310_mt312_ops = { | 615 | static struct dvb_frontend_ops vp310_mt312_ops = { |
686 | 616 | ||
687 | .info = { | 617 | .info = { |
@@ -720,6 +650,49 @@ static struct dvb_frontend_ops vp310_mt312_ops = { | |||
720 | .set_voltage = mt312_set_voltage, | 650 | .set_voltage = mt312_set_voltage, |
721 | }; | 651 | }; |
722 | 652 | ||
653 | struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config, | ||
654 | struct i2c_adapter* i2c) | ||
655 | { | ||
656 | struct mt312_state* state = NULL; | ||
657 | |||
658 | /* allocate memory for the internal state */ | ||
659 | state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL); | ||
660 | if (state == NULL) | ||
661 | goto error; | ||
662 | |||
663 | /* setup the state */ | ||
664 | state->config = config; | ||
665 | state->i2c = i2c; | ||
666 | memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops)); | ||
667 | |||
668 | /* check if the demod is there */ | ||
669 | if (mt312_readreg(state, ID, &state->id) < 0) | ||
670 | goto error; | ||
671 | |||
672 | switch (state->id) { | ||
673 | case ID_VP310: | ||
674 | strcpy(state->ops.info.name, "Zarlink VP310 DVB-S"); | ||
675 | state->frequency = 90; | ||
676 | break; | ||
677 | case ID_MT312: | ||
678 | strcpy(state->ops.info.name, "Zarlink MT312 DVB-S"); | ||
679 | state->frequency = 60; | ||
680 | break; | ||
681 | default: | ||
682 | printk (KERN_WARNING "Only Zarlink VP310/MT312 are supported chips.\n"); | ||
683 | goto error; | ||
684 | } | ||
685 | |||
686 | /* create dvb_frontend */ | ||
687 | state->frontend.ops = &state->ops; | ||
688 | state->frontend.demodulator_priv = state; | ||
689 | return &state->frontend; | ||
690 | |||
691 | error: | ||
692 | kfree(state); | ||
693 | return NULL; | ||
694 | } | ||
695 | |||
723 | module_param(debug, int, 0644); | 696 | module_param(debug, int, 0644); |
724 | MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); | 697 | MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); |
725 | 698 | ||
@@ -727,5 +700,4 @@ MODULE_DESCRIPTION("Zarlink VP310/MT312 DVB-S Demodulator driver"); | |||
727 | MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>"); | 700 | MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>"); |
728 | MODULE_LICENSE("GPL"); | 701 | MODULE_LICENSE("GPL"); |
729 | 702 | ||
730 | EXPORT_SYMBOL(mt312_attach); | 703 | EXPORT_SYMBOL(vp310_mt312_attach); |
731 | EXPORT_SYMBOL(vp310_attach); | ||
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h index b3a53a73a117..074d844f0139 100644 --- a/drivers/media/dvb/frontends/mt312.h +++ b/drivers/media/dvb/frontends/mt312.h | |||
@@ -38,10 +38,8 @@ struct mt312_config | |||
38 | int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); | 38 | int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); |
39 | }; | 39 | }; |
40 | 40 | ||
41 | extern struct dvb_frontend* mt312_attach(const struct mt312_config* config, | 41 | struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config, |
42 | struct i2c_adapter* i2c); | 42 | struct i2c_adapter* i2c); |
43 | 43 | ||
44 | extern struct dvb_frontend* vp310_attach(const struct mt312_config* config, | ||
45 | struct i2c_adapter* i2c); | ||
46 | 44 | ||
47 | #endif // MT312_H | 45 | #endif // MT312_H |
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c index 6122ba754bc5..eb15676d374f 100644 --- a/drivers/media/dvb/frontends/stv0297.c +++ b/drivers/media/dvb/frontends/stv0297.c | |||
@@ -393,10 +393,6 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
393 | break; | 393 | break; |
394 | 394 | ||
395 | case QAM_128: | 395 | case QAM_128: |
396 | delay = 150; | ||
397 | sweeprate = 1000; | ||
398 | break; | ||
399 | |||
400 | case QAM_256: | 396 | case QAM_256: |
401 | delay = 200; | 397 | delay = 200; |
402 | sweeprate = 500; | 398 | sweeprate = 500; |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index d36369e9e88f..7c6ccb96b157 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -1439,7 +1439,7 @@ static int check_firmware(struct av7110* av7110) | |||
1439 | len = ntohl(*(u32*) ptr); | 1439 | len = ntohl(*(u32*) ptr); |
1440 | ptr += 4; | 1440 | ptr += 4; |
1441 | if (len >= 512) { | 1441 | if (len >= 512) { |
1442 | printk("dvb-ttpci: dpram file is way to big.\n"); | 1442 | printk("dvb-ttpci: dpram file is way too big.\n"); |
1443 | return -EINVAL; | 1443 | return -EINVAL; |
1444 | } | 1444 | } |
1445 | if (crc != crc32_le(0, ptr, len)) { | 1445 | if (crc != crc32_le(0, ptr, len)) { |
@@ -2477,7 +2477,8 @@ static int frontend_init(struct av7110 *av7110) | |||
2477 | * The same behaviour of missing VSYNC can be duplicated on budget | 2477 | * The same behaviour of missing VSYNC can be duplicated on budget |
2478 | * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. | 2478 | * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. |
2479 | */ | 2479 | */ |
2480 | static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext) | 2480 | static int __devinit av7110_attach(struct saa7146_dev* dev, |
2481 | struct saa7146_pci_extension_data *pci_ext) | ||
2481 | { | 2482 | { |
2482 | const int length = TS_WIDTH * TS_HEIGHT; | 2483 | const int length = TS_WIDTH * TS_HEIGHT; |
2483 | struct pci_dev *pdev = dev->pci; | 2484 | struct pci_dev *pdev = dev->pci; |
@@ -2827,7 +2828,7 @@ err_kfree_0: | |||
2827 | goto out; | 2828 | goto out; |
2828 | } | 2829 | } |
2829 | 2830 | ||
2830 | static int av7110_detach(struct saa7146_dev* saa) | 2831 | static int __devexit av7110_detach(struct saa7146_dev* saa) |
2831 | { | 2832 | { |
2832 | struct av7110 *av7110 = saa->ext_priv; | 2833 | struct av7110 *av7110 = saa->ext_priv; |
2833 | dprintk(4, "%p\n", av7110); | 2834 | dprintk(4, "%p\n", av7110); |
@@ -2974,7 +2975,7 @@ static struct saa7146_extension av7110_extension = { | |||
2974 | .module = THIS_MODULE, | 2975 | .module = THIS_MODULE, |
2975 | .pci_tbl = &pci_tbl[0], | 2976 | .pci_tbl = &pci_tbl[0], |
2976 | .attach = av7110_attach, | 2977 | .attach = av7110_attach, |
2977 | .detach = av7110_detach, | 2978 | .detach = __devexit_p(av7110_detach), |
2978 | 2979 | ||
2979 | .irq_mask = MASK_19 | MASK_03 | MASK_10, | 2980 | .irq_mask = MASK_19 | MASK_03 | MASK_10, |
2980 | .irq_func = av7110_irq, | 2981 | .irq_func = av7110_irq, |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index b2e63e9fc053..0bb6e74ae7f0 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/dvb/ttpci/av7110_hw.c | |||
@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110) | |||
245 | 245 | ||
246 | /* test DEBI */ | 246 | /* test DEBI */ |
247 | iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); | 247 | iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); |
248 | /* FIXME: Why does Nexus CA require 2x iwdebi for first init? */ | ||
249 | iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); | ||
250 | |||
248 | if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) { | 251 | if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) { |
249 | printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: " | 252 | printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: " |
250 | "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n", | 253 | "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n", |
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index 617e4f6c0ed7..d54bbcdde2cc 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom) | |||
208 | } | 208 | } |
209 | 209 | ||
210 | 210 | ||
211 | int __init av7110_ir_init(struct av7110 *av7110) | 211 | int __devinit av7110_ir_init(struct av7110 *av7110) |
212 | { | 212 | { |
213 | static struct proc_dir_entry *e; | 213 | static struct proc_dir_entry *e; |
214 | 214 | ||
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 *av7110) | |||
248 | } | 248 | } |
249 | 249 | ||
250 | 250 | ||
251 | void __exit av7110_ir_exit(struct av7110 *av7110) | 251 | void __devexit av7110_ir_exit(struct av7110 *av7110) |
252 | { | 252 | { |
253 | int i; | 253 | int i; |
254 | 254 | ||