UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ehea: fix error return code in ehea_restart_qps() 

Fix to return -EFAULT from the error handling case instead of 0, as done
elsewhere in this function.

By the way, when get_zeroed_page() fails, directly return -ENOMEM to
simplify code.

Fixes: 2c69448bbc ("ehea: DLPAR memory add fix")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210528085555.9390-1-thunder.leizhen@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Zhen Lei 2021-05-28 16:55:55 +08:00 committed by Jakub Kicinski
parent ffb35c6798
commit 015dbf5662
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/ibm/ehea/ehea_main.c
View File

@ -2618,10 +2618,8 @@ static int ehea_restart_qps(struct net_device *dev)
u16 dummy16 = 0; u16 dummy16 = 0;
cb0 = (void *)get_zeroed_page(GFP_KERNEL); cb0 = (void *)get_zeroed_page(GFP_KERNEL);
if (!cb0) { if (!cb0)
ret = -ENOMEM; return -ENOMEM;
goto out;
}
for (i = 0; i < (port->num_def_qps); i++) { for (i = 0; i < (port->num_def_qps); i++) {
struct ehea_port_res *pr = &port->port_res[i]; struct ehea_port_res *pr = &port->port_res[i];
@ -2641,6 +2639,7 @@ static int ehea_restart_qps(struct net_device *dev)
cb0); cb0);
if (hret != H_SUCCESS) { if (hret != H_SUCCESS) {
netdev_err(dev, "query_ehea_qp failed (1)\n"); netdev_err(dev, "query_ehea_qp failed (1)\n");
ret = -EFAULT;
goto out; goto out;
} }
@ -2653,6 +2652,7 @@ static int ehea_restart_qps(struct net_device *dev)
&dummy64, &dummy16, &dummy16); &dummy64, &dummy16, &dummy16);
if (hret != H_SUCCESS) { if (hret != H_SUCCESS) {
netdev_err(dev, "modify_ehea_qp failed (1)\n"); netdev_err(dev, "modify_ehea_qp failed (1)\n");
ret = -EFAULT;
goto out; goto out;
} }
@ -2661,6 +2661,7 @@ static int ehea_restart_qps(struct net_device *dev)
cb0); cb0);
if (hret != H_SUCCESS) { if (hret != H_SUCCESS) {
netdev_err(dev, "query_ehea_qp failed (2)\n"); netdev_err(dev, "query_ehea_qp failed (2)\n");
ret = -EFAULT;
goto out; goto out;
} }