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

• Lines: 20
• Date: Mon Jun 19 13:42:40 2000
• Orig file: v2.4.0-test1/linux/drivers/scsi/pci2220i.c
• Orig date: Wed Apr 26 16:34:08 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/scsi/pci2220i.c linux/drivers/scsi/pci2220i.c
@@ -2386,8 +2386,8 @@
 	memset (&DaleSetup, 0, sizeof (DaleSetup));
 	memset (DiskMirror, 0, sizeof (DiskMirror));
 
-	zr = pcidev->resource[1].start & PCI_BASE_ADDRESS_IO_MASK;
-	zl = pcidev->resource[2].start & PCI_BASE_ADDRESS_IO_MASK;
+	zr = pci_resource_start (pcidev, 1);
+	zl = pci_resource_start (pcidev, 2);
 
 	padapter->basePort = zr;
 	padapter->regRemap		= zr + RTR_LOCAL_REMAP;					// 32 bit local space remap
@@ -2542,6 +2542,8 @@
 
 	while ( (pcidev = pci_find_device (VENDOR_PSI, DEVICE_DALE_1, pcidev)) != NULL )
 		{
+		if (pci_enable_device(pcidev))
+			continue;
 		pshost = scsi_register (tpnt, sizeof(ADAPTER2220I));
 		padapter = HOSTDATA(pshost);