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

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

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/scsi/pci2000.c linux/drivers/scsi/pci2000.c
@@ -679,10 +679,12 @@
 
 	while ( (pdev = pci_find_device (VENDOR_PSI, DEVICE_ROY_1, pdev)) != NULL )
 		{
+		if (pci_enable_device(pdev))
+			continue;
 		pshost = scsi_register (tpnt, sizeof(ADAPTER2000));
 		padapter = HOSTDATA(pshost);
 
-		padapter->basePort = pdev->resource[1].start & PCI_BASE_ADDRESS_IO_MASK;
+		padapter->basePort = pci_resource_start (pdev, 1);
 		DEB (printk ("\nBase Regs = %#04X", padapter->basePort));			// get the base I/O port address
 		padapter->mb0	= padapter->basePort + RTR_MAILBOX;		   			// get the 32 bit mail boxes
 		padapter->mb1	= padapter->basePort + RTR_MAILBOX + 4;