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

net/mlx4_core: Return proper error code when __mlx4_add_one fails 

Returning 0 (success) when in fact we are aborting the load, leads to kernel
panic when unloading the module. Fix that by returning the actual error code.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jack Morgenstein 2013-01-24 01:54:17 +00:00 committed by David S. Miller
parent dbd501a806
commit f356fcbe12
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -2169,7 +2169,8 @@ slave_start:
dev->num_slaves = MLX4_MAX_NUM_SLAVES; dev->num_slaves = MLX4_MAX_NUM_SLAVES;
else { else {
dev->num_slaves = 0; dev->num_slaves = 0;
if (mlx4_multi_func_init(dev)) { err = mlx4_multi_func_init(dev);
if (err) {
mlx4_err(dev, "Failed to init slave mfunc" mlx4_err(dev, "Failed to init slave mfunc"
" interface, aborting.\n"); " interface, aborting.\n");
goto err_cmd; goto err_cmd;
@ -2193,7 +2194,8 @@ slave_start:
/* In master functions, the communication channel must be initialized /* In master functions, the communication channel must be initialized
* after obtaining its address from fw */ * after obtaining its address from fw */
if (mlx4_is_master(dev)) { if (mlx4_is_master(dev)) {
if (mlx4_multi_func_init(dev)) { err = mlx4_multi_func_init(dev);
if (err) {
mlx4_err(dev, "Failed to init master mfunc" mlx4_err(dev, "Failed to init master mfunc"
"interface, aborting.\n"); "interface, aborting.\n");
goto err_close; goto err_close;
@ -2210,6 +2212,7 @@ slave_start:
mlx4_enable_msi_x(dev); mlx4_enable_msi_x(dev);
if ((mlx4_is_mfunc(dev)) && if ((mlx4_is_mfunc(dev)) &&
!(dev->flags & MLX4_FLAG_MSI_X)) { !(dev->flags & MLX4_FLAG_MSI_X)) {
err = -ENOSYS;
mlx4_err(dev, "INTx is not supported in multi-function mode." mlx4_err(dev, "INTx is not supported in multi-function mode."
" aborting.\n"); " aborting.\n");
goto err_free_eq; goto err_free_eq;