patch-2.3.18 linux/drivers/scsi/qlogicfc.c

• Lines: 23
• Date: Wed Sep 8 11:51:22 1999
• Orig file: v2.3.17/linux/drivers/scsi/qlogicfc.c
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.17/linux/drivers/scsi/qlogicfc.c linux/drivers/scsi/qlogicfc.c
@@ -53,9 +53,9 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/unistd.h>
+#include <linux/spinlock.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/spinlock.h>
 
 #include "sd.h"
 #include "hosts.h"
@@ -1885,9 +1885,8 @@
 		       pdev->device);
 		return 1;
 	}
-	if (command & PCI_COMMAND_IO && (io_base & 3) == 1)
-		io_base &= PCI_BASE_ADDRESS_IO_MASK;
-	else {
+	if (!(command & PCI_COMMAND_IO) ||
+	    !(pdev->resource[0].flags & IORESOURCE_IO)) {
 		printk("qlogicfc%d : i/o mapping is disabled\n", hostdata->host_id);
 		return 1;
 	}