[PATCH net-next 06/11] net: hns3: modify handling of out of memory in hclge_err.c

[Huazhong Tan]

From: Weihang Li <liweih...@hisilicon.com>

Users should be informed if HNS driver failed to allocate memory for
descriptor when handling hw errors. This patch solve above issues.

Signed-off-by: Weihang Li <liweih...@hisilicon.com>
Signed-off-by: Peng Li <lipeng...@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazh...@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c 
b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
index 3dfb265..dd7b8a8 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
@@ -1859,7 +1859,7 @@ static int hclge_handle_all_hw_msix_error(struct 
hclge_dev *hdev,
        if (ret) {
                dev_err(dev, "fail(%d) to query msix int status bd num\n",
                        ret);
-               return ret;
+               goto out;
        }
 
        mpf_bd_num = le32_to_cpu(desc_bd.data[0]);
@@ -1867,8 +1867,10 @@ static int hclge_handle_all_hw_msix_error(struct 
hclge_dev *hdev,
        bd_num = max_t(u32, mpf_bd_num, pf_bd_num);
 
        desc = kcalloc(bd_num, sizeof(struct hclge_desc), GFP_KERNEL);
-       if (!desc)
+       if (!desc) {
+               ret = -ENOMEM;
                goto out;
+       }
 
        ret = hclge_handle_mpf_msix_error(hdev, desc, mpf_bd_num,
                                          reset_requests);
-- 
2.7.4