提交 f356fcbe 编写于 作者: J Jack Morgenstein 提交者: David S. Miller

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: NJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: NEugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: NAmir Vadai <amirv@mellanox.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 dbd501a8
...@@ -2169,7 +2169,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data) ...@@ -2169,7 +2169,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
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 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data) ...@@ -2193,7 +2194,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
/* 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 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data) ...@@ -2210,6 +2212,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册