From: Jacob Keller <jacob.e.keller@intel.com>
Date: Tue, 7 Jun 2016 23:09:01 +0000 (-0700)
Subject: fm10k: return proper error code when pci_enable_msix_range fails
X-Git-Tag: v4.1.12-92~3^2~102
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0a42c8ebb587313a76e8182cb006c281bbb56036;p=users%2Fjedix%2Flinux-maple.git

fm10k: return proper error code when pci_enable_msix_range fails

The pci_enable_msix_range() function returns a positive value of the
number of allocated vectors if it succeeds. On failure it returns
a negative error code. Return this code properly so that the error
message printed by the driver will show the actual error code instead of
being masked by -ENOMEM.

Signed-off-by: Jacob Keller <jacob.e.keller@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 30e23b711c7b92dea664e61c3eb4b2cdc4b262e9)
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 e443da4c28ef..ce788a7c9232 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1874,7 +1874,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface)
 	if (v_budget < 0) {
 		kfree(interface->msix_entries);
 		interface->msix_entries = NULL;
-		return -ENOMEM;
+		return v_budget;
 	}
 
 	/* record the number of queues available for q_vectors */