[SCSI] qla4xxx: Skip retry of initialize_adapter for ISP80XX

While probe Skip retry of initialize_adapter only for ISP82XX and ISP83XX.
We need to retry initialize_adapter for ISP40XX.

Signed-off-by: Nilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 18f857a3b89650a93c4f5150d845c889ed928cc7..f3cf04ebf5168b0bba995b9018628b7651384c6b 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -5345,8 +5345,11 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,
        status = qla4xxx_initialize_adapter(ha, INIT_ADAPTER);
 
        /* Dont retry adapter initialization if IRQ allocation failed */
-       if (!test_bit(AF_IRQ_ATTACHED, &ha->flags))
+       if (is_qla80XX(ha) && !test_bit(AF_IRQ_ATTACHED, &ha->flags)) {
+               ql4_printk(KERN_WARNING, ha, "%s: Skipping retry of adapter initialization\n",
+                          __func__);
                goto skip_retry_init;
+       }
 
        while ((!test_bit(AF_ONLINE, &ha->flags)) &&
            init_retry_count++ < MAX_INIT_RETRIES) {