From: Alexander Duyck <aduyck@mirantis.com>
Date: Tue, 27 Oct 2015 23:59:12 +0000 (-0700)
Subject: fm10k: Cleanup MSI-X interrupts in case of failure
X-Git-Tag: v4.1.12-92~3^2~171
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8884ef47fd6d5f9b34d5d7b6051131c14567d5af;p=users%2Fjedix%2Flinux-maple.git

fm10k: Cleanup MSI-X interrupts in case of failure

If the q_vector allocation fails we should free the resources associated
with the MSI-X vector table.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Reviewed-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Orabug: 25394529
(cherry picked from commit 587731e684dcf3522215194a02357d26b9bc7277)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 0b90a590b8762..349332533962a 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1998,8 +1998,10 @@ int fm10k_init_queueing_scheme(struct fm10k_intfc *interface)
 
 	/* Allocate memory for queues */
 	err = fm10k_alloc_q_vectors(interface);
-	if (err)
+	if (err) {
+		fm10k_reset_msix_capability(interface);
 		return err;
+	}
 
 	/* Map rings to devices, and map devices to physical queues */
 	fm10k_assign_rings(interface);