| From 18778191b0804b4e0fcee0f773e5dce8329b815f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 18 Jun 2020 14:19:53 +0000 |
| Subject: iavf: fix error return code in iavf_init_get_resources() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit 753f3884f253de6b6d3a516e6651bda0baf4aede ] |
| |
| Fix to return negative error code -ENOMEM from the error handling |
| case instead of 0, as done elsewhere in this function. |
| |
| Fixes: b66c7bc1cd4d ("iavf: Refactor init state machine") |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Tested-by: Andrew Bowers <andrewx.bowers@intel.com> |
| Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c |
| index a21ae74bcd1b6..8deff711cc02c 100644 |
| --- a/drivers/net/ethernet/intel/iavf/iavf_main.c |
| +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c |
| @@ -1863,8 +1863,10 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter) |
| |
| adapter->rss_key = kzalloc(adapter->rss_key_size, GFP_KERNEL); |
| adapter->rss_lut = kzalloc(adapter->rss_lut_size, GFP_KERNEL); |
| - if (!adapter->rss_key || !adapter->rss_lut) |
| + if (!adapter->rss_key || !adapter->rss_lut) { |
| + err = -ENOMEM; |
| goto err_mem; |
| + } |
| if (RSS_AQ(adapter)) |
| adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_RSS; |
| else |
| -- |
| 2.25.1 |
| |
