Commit 17801c96 authored by Nilesh Javali's avatar Nilesh Javali Committed by James Bottomley

[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: default avatarNilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 9a16f65b
...@@ -5345,8 +5345,11 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, ...@@ -5345,8 +5345,11 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,
status = qla4xxx_initialize_adapter(ha, INIT_ADAPTER); status = qla4xxx_initialize_adapter(ha, INIT_ADAPTER);
/* Dont retry adapter initialization if IRQ allocation failed */ /* 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; goto skip_retry_init;
}
while ((!test_bit(AF_ONLINE, &ha->flags)) && while ((!test_bit(AF_ONLINE, &ha->flags)) &&
init_retry_count++ < MAX_INIT_RETRIES) { init_retry_count++ < MAX_INIT_RETRIES) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment