]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fm10k: Cleanup MSI-X interrupts in case of failure
authorAlexander Duyck <aduyck@mirantis.com>
Tue, 27 Oct 2015 23:59:12 +0000 (16:59 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 06:03:36 +0000 (22:03 -0800)
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>
drivers/net/ethernet/intel/fm10k/fm10k_main.c

index 0b90a590b8762f6d23e719d4e4012f9d65874af7..349332533962ad0f71e3a7dbc5459a02fa20db55 100644 (file)
@@ -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);