Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f356fcbe authored by Jack Morgenstein's avatar Jack Morgenstein Committed by David S. Miller
Browse files

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: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbd501a8

drivers/net/ethernet/mellanox/mlx4/main.c

+5 −2
Original line number Diff line number Diff line
@@ -2169,7 +2169,8 @@ slave_start: 
			dev->num_slaves = MLX4_MAX_NUM_SLAVES;

		else {

			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"

					 " interface, aborting.\n");

				goto err_cmd;
@@ -2193,7 +2194,8 @@ slave_start: 
	/* In master functions, the communication channel must be initialized

	 * after obtaining its address from fw */

	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"

				 "interface, aborting.\n");

			goto err_close;
@@ -2210,6 +2212,7 @@ slave_start: 
	mlx4_enable_msi_x(dev);

	if ((mlx4_is_mfunc(dev)) &&

	    !(dev->flags & MLX4_FLAG_MSI_X)) {

		err = -ENOSYS;

		mlx4_err(dev, "INTx is not supported in multi-function mode."

			 " aborting.\n");

		goto err_free_eq;