]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
iavf: fix error return code in iavf_init_get_resources()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 18 Jun 2020 14:19:53 +0000 (14:19 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:16:09 +0000 (08:16 +0200)
[ 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

index bacc5fb7eba2c0ba67cc342039335d877af017b5..905fc45b4a58f0834debcdd5bf66aed5be87fd70 100644 (file)
@@ -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