patch-2.4.0-test2 linux/drivers/scsi/ips.c

• Lines: 25
• Date: Mon Jun 19 13:42:40 2000
• Orig file: v2.4.0-test1/linux/drivers/scsi/ips.c
• Orig date: Thu Feb 10 17:11:13 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/scsi/ips.c linux/drivers/scsi/ips.c
@@ -325,12 +325,13 @@
 
       if (!(dev = pci_find_device(IPS_VENDORID, IPS_DEVICEID, dev)))
          break;
-
+      if (pci_enable_device(dev))
+      	 break;
       /* stuff that we get in dev */
       irq = dev->irq;
       bus = dev->bus->number;
       func = dev->devfn;
-      io_addr = dev->resource[0].start;
+      io_addr = pci_resource_start(dev, 0);
 
       /* get planer status */
       if (pci_read_config_word(dev, 0x04, &planer)) {
@@ -341,7 +342,7 @@
       }
 
       /* check I/O address */
-      if ((dev->resource[0].flags & PCI_BASE_ADDRESS_SPACE) != PCI_BASE_ADDRESS_SPACE_IO)
+      if (pci_resource_flags(dev, 0) & IORESOURCE_MEM)
          continue;
 
       /* check to see if an onboard planer controller is disabled */