diff options
| author |   Nilesh Javali <nilesh.javali@qlogic.com> | 2013-03-22 07:22:42 -0400 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2013-04-11 14:32:13 -0700 |
| commit | 17801c96b6fdf6048908e0680a140a87a267a397 (patch) | |
| tree | 6e1b958282b607d0a3c5e83b59bd6ce4bcc8acfa /drivers/scsi/qla4xxx | |
| parent | [SCSI] qla4xxx: Assign correct CHAP table address to FLT (diff) | |
| download | linux-dev-17801c96b6fdf6048908e0680a140a87a267a397.tar.xz linux-dev-17801c96b6fdf6048908e0680a140a87a267a397.zip | |
[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>
Diffstat (limited to 'drivers/scsi/qla4xxx')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 18f857a3b896..f3cf04ebf516 100644 --- 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) { |