patch-2.4.0-test2 linux/drivers/isdn/hisax/bkm_a4t.c

• Lines: 23
• Date: Mon Jun 19 17:59:40 2000
• Orig file: v2.4.0-test1/linux/drivers/isdn/hisax/bkm_a4t.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/isdn/hisax/bkm_a4t.c linux/drivers/isdn/hisax/bkm_a4t.c
@@ -319,11 +319,13 @@
 	if ((dev_a4t = pci_find_device(I20_VENDOR_ID, I20_DEVICE_ID, dev_a4t))) {
 		u_int sub_sys_id = 0;
 
+		if (pci_enable_device(dev_a4t))
+			return (0);
 		pci_read_config_dword(dev_a4t, PCI_SUBSYSTEM_VENDOR_ID,
 			&sub_sys_id);
 		if (sub_sys_id == ((A4T_SUBSYS_ID << 16) | A4T_SUBVEN_ID)) {
 			found = 1;
-			pci_memaddr = dev_a4t->resource[ 0].start;
+			pci_memaddr = pci_resource_start (dev_a4t, 0);
 			cs->irq = dev_a4t->irq;
 		}
 	}
@@ -339,7 +341,6 @@
 		printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]);
 		return (0);
 	}
-	pci_memaddr &= PCI_BASE_ADDRESS_MEM_MASK;
 	cs->hw.ax.base = (u_int) ioremap(pci_memaddr, 4096);
 	/* Check suspecious address */
 	pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base);