Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-10-05 16:09:59 +0200
committerJiri Kosina <jkosina@suse.cz>2017-10-05 16:09:59 +0200
commit760d0bcd88c95c4895cabea4bc4fdf6e0ed304e4 (patch)
treef6fd201d11c0e38536e9d76dd137d16854f7ed2c
parenta8d3999dc7eca26e0a45360414d726a4049c6b3f (diff)
parentbbd3cd832bb00e0049114890c1542e875bd6a56f (diff)
Merge remote-tracking branch 'origin/users/tbogendoerfer/SLE15/for-next' into SLE15rpm-4.12.14-1
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/health.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index b9533254145e..8aea0a065e56 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -195,7 +195,6 @@ static void health_care(struct work_struct *work)
mlx5_handle_bad_state(dev);
spin_lock_irqsave(&health->wq_lock, flags);
- spin_lock(&health->wq_lock);
if (!test_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags))
schedule_delayed_work(&health->recover_work, recover_delay);
else