diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:21:59 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 14:21:59 -0500 |
| commit | 9088c54fbb23ac57ad9588549377814e45d36889 (patch) | |
| tree | 23431a18ac6d1a869581515cc17ec4c24f1fdf3b /drivers/infiniband | |
| parent | 8ae85bd0256abca81d6aedbede3ba0749abc058d (diff) | |
| parent | 1852eae92c460813692808234da35d142a405ab7 (diff) | |
Merge tag 'v4.9.53' into v4.9-rt
This is the 4.9.53 stable release
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/cm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index 9398143d7c5e..6512a555f7f8 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -2577,9 +2577,9 @@ fail: c4iw_put_ep(&child_ep->com); reject: reject_cr(dev, hwtid, skb); +out: if (parent_ep) c4iw_put_ep(&parent_ep->com); -out: return 0; } @@ -3441,7 +3441,7 @@ int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) cm_id->provider_data = ep; goto out; } - + remove_handle(ep->com.dev, &ep->com.dev->stid_idr, ep->stid); cxgb4_free_stid(ep->com.dev->rdev.lldi.tids, ep->stid, ep->com.local_addr.ss_family); fail2: |