patch-2.4.0-test2 linux/drivers/i2o/i2o_pci.c

• Lines: 21
• Date: Mon Jun 19 13:30:56 2000
• Orig file: v2.4.0-test1/linux/drivers/i2o/i2o_pci.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/i2o/i2o_pci.c linux/drivers/i2o/i2o_pci.c
@@ -132,9 +132,9 @@
 	for(i=0; i<6; i++)
 	{
 		/* Skip I/O spaces */
-		if(!(dev->resource[i].flags&PCI_BASE_ADDRESS_SPACE))
+		if(!(pci_resource_flags(dev, i) & IORESOURCE_IO))
 		{
-			memptr=dev->resource[i].start;
+			memptr = pci_resource_start(dev, i);
 			break;
 		}
 	}
@@ -256,6 +256,8 @@
 			printk(KERN_INFO "i2o: I2O Controller found but does not support I2O 1.5 (skipping).\n");
 			continue;
 		}
+		if (pci_enable_device(dev))
+			continue;
 		printk(KERN_INFO "i2o: I2O controller on bus %d at %d.\n",
 			dev->bus->number, dev->devfn);
 		pci_set_master(dev);