patch-2.1.121 linux/drivers/scsi/qlogicisp.c

• Lines: 21
• Date: Sun Sep 6 10:34:33 1998
• Orig file: v2.1.120/linux/drivers/scsi/qlogicisp.c
• Orig date: Fri May 8 23:14:50 1998

diff -u --recursive --new-file v2.1.120/linux/drivers/scsi/qlogicisp.c linux/drivers/scsi/qlogicisp.c
@@ -1106,6 +1106,10 @@
 	DEBUG(printk("qlogicisp : loading risc ram\n"));
 
 #if RELOAD_FIRMWARE
+	/* Do not reload firmware if 1040B, i.e. revision 5 chip.  */
+	if (((struct isp1020_hostdata *) host->hostdata)->revision == 5)
+		printk("qlogicisp : 1040B chip, firmware not (re)loaded\n");
+	else
 	{
 		int i;
 		for (i = 0; i < risc_code_length01; i++) {
@@ -1213,7 +1217,8 @@
 	if (inw(io_base + PCI_ID_LOW) != PCI_VENDOR_ID_QLOGIC
 	    || inw(io_base + PCI_ID_HIGH) != PCI_DEVICE_ID_QLOGIC_ISP1020)
 	{
-		printk("qlogicisp : can't decode i/o address space\n");
+		printk("qlogicisp : can't decode i/o address space 0x%lx\n",
+		       io_base);
 		return 1;
 	}