diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-11-08 14:10:38 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-11-08 14:10:38 +0100 |
| commit | 6b240aeb121ec14a528a58413baa9a74f8749604 (patch) | |
| tree | 4148d2f8aa56b75488fbd568048ac81fa786ae9a /drivers/infiniband/sw/siw/siw_verbs.c | |
| parent | Revert "gpio: merrifield: Pass irqchip when adding gpiochip" (diff) | |
| parent | Revert "gpio: expose pull-up/pull-down line flags to userspace" (diff) | |
| download | linux-6b240aeb121ec14a528a58413baa9a74f8749604.tar.xz linux-6b240aeb121ec14a528a58413baa9a74f8749604.zip | |
Merge branch 'devel' into for-next
Diffstat (limited to 'drivers/infiniband/sw/siw/siw_verbs.c')
| -rw-r--r-- | drivers/infiniband/sw/siw/siw_verbs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c index 869e02b69a01..b18a677832e1 100644 --- a/drivers/infiniband/sw/siw/siw_verbs.c +++ b/drivers/infiniband/sw/siw/siw_verbs.c @@ -604,7 +604,6 @@ out: int siw_destroy_qp(struct ib_qp *base_qp, struct ib_udata *udata) { struct siw_qp *qp = to_siw_qp(base_qp); - struct siw_base_qp *siw_base_qp = to_siw_base_qp(base_qp); struct siw_ucontext *uctx = rdma_udata_to_drv_context(udata, struct siw_ucontext, base_ucontext); @@ -641,7 +640,6 @@ int siw_destroy_qp(struct ib_qp *base_qp, struct ib_udata *udata) qp->scq = qp->rcq = NULL; siw_qp_put(qp); - kfree(siw_base_qp); return 0; } |