diff options
| author |   Doug Ledford <dledford@redhat.com> | 2015-06-11 01:13:30 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-06-11 01:13:30 -0400 |
| commit | 0699ee7ad7da8bde59d9cf13a50da95e1931e61d (patch) | |
| tree | 2df54fc0d365b0645c4072360b610885351e16ef /drivers/infiniband/hw/ocrdma | |
| parent | IB/core: Don't warn on no SA support in event handler (diff) | |
| parent | RDMA/ocrdma: fix double free on pd (diff) | |
| download | linux-dev-0699ee7ad7da8bde59d9cf13a50da95e1931e61d.tar.xz linux-dev-0699ee7ad7da8bde59d9cf13a50da95e1931e61d.zip | |
Merge branch 'for-4.2-misc' into k.o/for-4.2
Diffstat (limited to 'drivers/infiniband/hw/ocrdma')
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index cf1f515efda8..19566907b4d2 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -684,7 +684,6 @@ err: ocrdma_release_ucontext_pd(uctx); } else { status = _ocrdma_dealloc_pd(dev, pd); - kfree(pd); } exit: return ERR_PTR(status); |