Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17801c96 authored Mar 22, 2013 by Nilesh Javali Committed by James Bottomley Apr 11, 2013

[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>

parent 9a16f65b

drivers/scsi/qla4xxx/ql4_os.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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) {