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

• Lines: 18
• Date: Mon Jun 19 13:42:40 2000
• Orig file: v2.4.0-test1/linux/drivers/scsi/qlogicfc.c
• Orig date: Sat Feb 26 22:31:48 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/scsi/qlogicfc.c linux/drivers/scsi/qlogicfc.c
@@ -746,6 +746,8 @@
 
 	for (i=0; i<2; i++){
 	        while ((pdev = pci_find_device(PCI_VENDOR_ID_QLOGIC, device_ids[i], pdev))) {
+			if (pci_enable_device(pdev))
+				continue;
 
 		        host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata));
 			host->max_id = QLOGICFC_MAX_ID + 1;
@@ -2004,7 +2006,7 @@
 		printk("qlogicfc%d : error reading PCI configuration\n", hostdata->host_id);
 		return 1;
 	}
-	io_base = pdev->resource[0].start;
+	io_base = pci_resource_start(pdev, 0);
 	irq = pdev->irq;