aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/bttv-cards.c14
-rw-r--r--drivers/media/video/bttv-driver.c11
2 files changed, 11 insertions, 14 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 75033f06551f..e872cd47a648 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -1731,10 +1731,7 @@ struct tvcard bttv_tvcards[] = {
1731 .no_msp34xx = 1, 1731 .no_msp34xx = 1,
1732 .no_tda9875 = 1, 1732 .no_tda9875 = 1,
1733 .no_tda7432 = 1, 1733 .no_tda7432 = 1,
1734 .gpiomask = 0x01,
1735 .audiomux = { 0, 0, 0, 0, 1 },
1736 .muxsel = { 3, 0, 1, 2}, 1734 .muxsel = { 3, 0, 1, 2},
1737 .needs_tvaudio = 0,
1738 .pll = PLL_28, 1735 .pll = PLL_28,
1739 .no_gpioirq = 1, 1736 .no_gpioirq = 1,
1740 .has_dvb = 1, 1737 .has_dvb = 1,
@@ -2808,11 +2805,12 @@ void __devinit bttv_init_card1(struct bttv *btv)
2808 break; 2805 break;
2809 case BTTV_TWINHAN_DST: 2806 case BTTV_TWINHAN_DST:
2810 case BTTV_AVDVBT_771: 2807 case BTTV_AVDVBT_771:
2808 case BTTV_PINNACLESAT:
2811 btv->use_i2c_hw = 1; 2809 btv->use_i2c_hw = 1;
2812 break; 2810 break;
2813 case BTTV_ADLINK_RTV24: 2811 case BTTV_ADLINK_RTV24:
2814 init_RTV24( btv ); 2812 init_RTV24( btv );
2815 break; 2813 break;
2816 2814
2817 } 2815 }
2818 if (!bttv_tvcards[btv->c.type].has_dvb) 2816 if (!bttv_tvcards[btv->c.type].has_dvb)
@@ -2997,8 +2995,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
2997 btv->has_radio=1; 2995 btv->has_radio=1;
2998 if (bttv_tvcards[btv->c.type].has_remote) 2996 if (bttv_tvcards[btv->c.type].has_remote)
2999 btv->has_remote=1; 2997 btv->has_remote=1;
3000 if (bttv_tvcards[btv->c.type].no_gpioirq) 2998 if (!bttv_tvcards[btv->c.type].no_gpioirq)
3001 btv->gpioirq=0; 2999 btv->gpioirq=1;
3002 if (bttv_tvcards[btv->c.type].audio_hook) 3000 if (bttv_tvcards[btv->c.type].audio_hook)
3003 btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook; 3001 btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook;
3004 3002
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index d538a994ff04..4826cf0d39d2 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -3889,18 +3889,17 @@ static int __devinit bttv_probe(struct pci_dev *dev,
3889 btv->timeout.function = bttv_irq_timeout; 3889 btv->timeout.function = bttv_irq_timeout;
3890 btv->timeout.data = (unsigned long)btv; 3890 btv->timeout.data = (unsigned long)btv;
3891 3891
3892 btv->i2c_rc = -1; 3892 btv->i2c_rc = -1;
3893 btv->tuner_type = UNSET; 3893 btv->tuner_type = UNSET;
3894 btv->pinnacle_id = UNSET; 3894 btv->pinnacle_id = UNSET;
3895 btv->new_input = UNSET; 3895 btv->new_input = UNSET;
3896 btv->gpioirq = 1;
3897 btv->has_radio=radio[btv->c.nr]; 3896 btv->has_radio=radio[btv->c.nr];
3898 3897
3899 /* pci stuff (init, get irq/mmio, ... */ 3898 /* pci stuff (init, get irq/mmio, ... */
3900 btv->c.pci = dev; 3899 btv->c.pci = dev;
3901 btv->id = dev->device; 3900 btv->id = dev->device;
3902 if (pci_enable_device(dev)) { 3901 if (pci_enable_device(dev)) {
3903 printk(KERN_WARNING "bttv%d: Can't enable device.\n", 3902 printk(KERN_WARNING "bttv%d: Can't enable device.\n",
3904 btv->c.nr); 3903 btv->c.nr);
3905 return -EIO; 3904 return -EIO;
3906 } 3905 }