Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / bttv-cards.c

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 64785d3fe838e59202b09101f85d6d981b4ac94f..190977a1e5494598b753d3a34ea5c2a60ad989b6 100644 (file)
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -299,8 +299,8 @@ static struct CARD {
        { 0x00011822, BTTV_TWINHAN_DST,   "Twinhan VisionPlus DVB" },
        { 0xfc00270f, BTTV_TWINHAN_DST,   "ChainTech digitop DST-1000 DVB-S" },
        { 0x07711461, BTTV_AVDVBT_771,    "AVermedia AverTV DVB-T 771" },
-       { 0xdb1018ac, BTTV_DVICO_DVBT_LITE,    "DVICO FusionHDTV DVB-T Lite" },
-       { 0xd50018ac, BTTV_DVICO_FUSIONHDTV_5_LITE,    "DVICO FusionHDTV 5 Lite" },
+       { 0xdb1018ac, BTTV_DVICO_DVBT_LITE,    "DViCO FusionHDTV DVB-T Lite" },
+       { 0xd50018ac, BTTV_DVICO_FUSIONHDTV_5_LITE,    "DViCO FusionHDTV 5 Lite" },
 
        { 0, -1, NULL }
 };
@@ -3060,7 +3060,7 @@ static void __devinit hauppauge_eeprom(struct bttv *btv)
 {
        struct tveeprom tv;
 
-       tveeprom_hauppauge_analog(&tv, eeprom_data);
+       tveeprom_hauppauge_analog(&btv->i2c_client, &tv, eeprom_data);
        btv->tuner_type = tv.tuner_type;
        btv->has_radio  = tv.has_radio;
 }
@@ -4485,6 +4485,7 @@ void __devinit bttv_check_chipset(void)
        }
        if (UNSET != latency)
                printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
+
        while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL,
                                      PCI_DEVICE_ID_INTEL_82441, dev))) {
                 unsigned char b;