diff options
| author |   Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
| commit | 525a2c651cdd08b19a4c04f63b87e460765220ac (patch) | |
| tree | ad65ead1b0a281be08e5c47e2a7eb911dd0d2a9b /drivers/infiniband/sw/siw/siw_cm.c | |
| parent | IB/mlx5: Support per device q counters in switchdev mode (diff) | |
| parent | Do not dereference 'siw_crypto_shash' before checking (diff) | |
| download | linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.tar.xz linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.zip | |
Merge branch 'wip/dl-for-rc' into wip/dl-for-next
The fix for IB port statistics initialization ("IB/core: Fix querying
total rdma stats") is needed before we take a follow-on patch to
for-next.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/sw/siw/siw_cm.c')
| -rw-r--r-- | drivers/infiniband/sw/siw/siw_cm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c index a7cde98e73e8..9ce8a1b925d2 100644 --- a/drivers/infiniband/sw/siw/siw_cm.c +++ b/drivers/infiniband/sw/siw/siw_cm.c @@ -220,13 +220,12 @@ static void siw_put_work(struct siw_cm_work *work) static void siw_cep_set_inuse(struct siw_cep *cep) { unsigned long flags; - int rv; retry: spin_lock_irqsave(&cep->lock, flags); if (cep->in_use) { spin_unlock_irqrestore(&cep->lock, flags); - rv = wait_event_interruptible(cep->waitq, !cep->in_use); + wait_event_interruptible(cep->waitq, !cep->in_use); if (signal_pending(current)) flush_signals(current); goto retry; |