diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-03 13:42:10 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-03 13:42:10 +0300 |
| commit | 3a3f7d130eb5c219a1a4b183b92106028747dc85 (patch) | |
| tree | c089ee16fe465b94b473c92b834cab08ca57352d /drivers/net/ethernet/mellanox/mlx5/core/main.c | |
| parent | 784c372a8184bdb8ae722c94250c2d57dc327a8e (diff) | |
| parent | ea23b42739a2c3c1158344928048fff8c70d1f66 (diff) | |
| download | linux-3a3f7d130eb5c219a1a4b183b92106028747dc85.tar.xz | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some overlapping changes in the mlx5 driver.
A merge conflict resolution posted by Stephen Rothwell was used as a
guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 719f8e974482..c065132b956d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1034,7 +1034,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, if (err) { dev_err(&dev->pdev->dev, "Firmware over %d MS in pre-initializing state, aborting\n", FW_PRE_INIT_TIMEOUT_MILI); - goto out; + goto out_err; } err = mlx5_cmd_init(dev); @@ -1258,7 +1258,7 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, int err = 0; if (cleanup) - mlx5_drain_health_wq(dev); + mlx5_drain_health_recovery(dev); mutex_lock(&dev->intf_state_mutex); if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) { |