Skip to content

Commit 17801c9

Browse files
Nilesh JavaliJames Bottomley
authored andcommitted
[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>
1 parent 9a16f65 commit 17801c9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/scsi/qla4xxx/ql4_os.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5345,8 +5345,11 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,
53455345
status = qla4xxx_initialize_adapter(ha, INIT_ADAPTER);
53465346

53475347
/* Dont retry adapter initialization if IRQ allocation failed */
5348-
if (!test_bit(AF_IRQ_ATTACHED, &ha->flags))
5348+
if (is_qla80XX(ha) && !test_bit(AF_IRQ_ATTACHED, &ha->flags)) {
5349+
ql4_printk(KERN_WARNING, ha, "%s: Skipping retry of adapter initialization\n",
5350+
__func__);
53495351
goto skip_retry_init;
5352+
}
53505353

53515354
while ((!test_bit(AF_ONLINE, &ha->flags)) &&
53525355
init_retry_count++ < MAX_INIT_RETRIES) {

0 commit comments

Comments
 (0)