Merge branch 'linus/master' into rdma.git for-next

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx5 / core / cmd.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 9364015c818b94079884bd7ba960940549faacea..3ce14d42ddc8984eecc2c19cb73f8d379b7f6498 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -211,7 +211,7 @@ static void poll_timeout(struct mlx5_cmd_work_ent *ent)
                        ent->ret = 0;
                        return;
                }
-               usleep_range(5000, 10000);
+               cond_resched();
        } while (time_before(jiffies, poll_end));
 
        ent->ret = -ETIMEDOUT;