bfa: Do not call pci_enable_msix() after it failed once

Function pci_enable_msix() should not be called in case
it threw a negative errno from a previous call.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Acked-by: Anil Gurumurthy <anil.gurumurthy@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 23 insertions, 25 deletions

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 7593b7c1d336..bb931808328f 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1235,33 +1235,31 @@ bfad_setup_intr(struct bfad_s *bfad)
            (bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) {
 
                 error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec);
-                if (error) {
-                        /* In CT1 & CT2, try to allocate just one vector */
-                        if (bfa_asic_id_ctc(pdev->device)) {
-                                printk(KERN_WARNING "bfa %s: trying one msix "
-                                       "vector failed to allocate %d[%d]\n",
-                                       bfad->pci_name, bfad->nvec, error);
-                                bfad->nvec = 1;
-                                error = pci_enable_msix(bfad->pcidev,
+                /* In CT1 & CT2, try to allocate just one vector */
+                if (error > 0 && bfa_asic_id_ctc(pdev->device)) {
+                        printk(KERN_WARNING "bfa %s: trying one msix "
+                               "vector failed to allocate %d[%d]\n",
+                               bfad->pci_name, bfad->nvec, error);
+                        bfad->nvec = 1;
+                        error = pci_enable_msix(bfad->pcidev,
                                                 msix_entries, bfad->nvec);
-                        }
+                }
 
-                        /*
-                         * Only error number of vector is available.
-                         * We don't have a mechanism to map multiple
-                         * interrupts into one vector, so even if we
-                         * can try to request less vectors, we don't
-                         * know how to associate interrupt events to
-                         *  vectors. Linux doesn't duplicate vectors
-                         * in the MSIX table for this case.
-                         */
-                        if (error) {
-                                printk(KERN_WARNING "bfad%d: "
-                                       "pci_enable_msix failed (%d), "
-                                       "use line based.\n",
-                                        bfad->inst_no, error);
-                                goto line_based;
-                        }
+                /*
+                 * Only error number of vector is available.
+                 * We don't have a mechanism to map multiple
+                 * interrupts into one vector, so even if we
+                 * can try to request less vectors, we don't
+                 * know how to associate interrupt events to
+                 *  vectors. Linux doesn't duplicate vectors
+                 * in the MSIX table for this case.
+                 */
+                if (error) {
+                        printk(KERN_WARNING "bfad%d: "
+                               "pci_enable_msix failed (%d), "
+                               "use line based.\n",
+                                bfad->inst_no, error);
+                        goto line_based;
                 }
 
                 /* Disable INTX in MSI-X mode */