patch-2.3.99-pre7 linux/drivers/char/bttv.c

• Lines: 20
• Date: Fri Apr 28 23:00:06 2000
• Orig file: v2.3.99-pre6/linux/drivers/char/bttv.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/bttv.c linux/drivers/char/bttv.c
@@ -3661,7 +3661,10 @@
 
         btv->id=dev->device;
         btv->irq=dev->irq;
-        btv->bt848_adr=dev->resource[0].start;
+        btv->bt848_adr=pci_resource_start(dev, 0);
+
+	if (pci_enable_device(dev))
+		return -EIO;
 	if (!request_mem_region(pci_resource_start(dev,0),
 				pci_resource_len(dev,0),
 				"bttv")) {
@@ -3672,7 +3675,6 @@
         else
                 btv->i2c_command=(I2C_TIMING | BT848_I2C_SCL | BT848_I2C_SDA);
 
-        btv->bt848_adr&=PCI_BASE_ADDRESS_MEM_MASK;
         pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision);
         printk(KERN_INFO "bttv%d: Brooktree Bt%d (rev %d) ",
                bttv_num,btv->id, btv->revision);