From e7f7b86ca0de1d6a8fa6cf5a3f5a1eeb24f027c0 Mon Sep 17 00:00:00 2001 From: Nilesh Javali Date: Fri, 22 Mar 2013 07:22:42 -0400 Subject: [PATCH] --- yaml --- r: 367397 b: refs/heads/master c: 17801c96b6fdf6048908e0680a140a87a267a397 h: refs/heads/master i: 367395: c3e9984f1b7eea2141055b0a004fb542bf413830 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab0ece3feb58..0566370a7c40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a16f65bed06e562abb9882ffb277c6808a0fe34 +refs/heads/master: 17801c96b6fdf6048908e0680a140a87a267a397 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c index 18f857a3b896..f3cf04ebf516 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_os.c +++ b/trunk/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) {