diff options
| author | Steve Wise <swise@opengridcomputing.com> | 2010-05-20 16:57:54 -0500 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-05-24 21:08:02 -0700 |
| commit | 841dba9a5a0dbced4b4bc240f444d47f30ba6724 (patch) | |
| tree | cdae26232d78a7ee0cc9db179750d37eaf9c84c1 /drivers | |
| parent | 7ec45b923446d484eb39434e18d354666426e606 (diff) | |
| download | linux-841dba9a5a0dbced4b4bc240f444d47f30ba6724.tar.gz linux-841dba9a5a0dbced4b4bc240f444d47f30ba6724.tar.bz2 linux-841dba9a5a0dbced4b4bc240f444d47f30ba6724.zip | |
RDMA/cxgb4: Return proper errors in fastreg mr/pbl allocation
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/mem.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c index e54ff6d25691..993ed1fe7bf6 100644 --- a/drivers/infiniband/hw/cxgb4/mem.c +++ b/drivers/infiniband/hw/cxgb4/mem.c @@ -712,8 +712,10 @@ struct ib_mr *c4iw_alloc_fast_reg_mr(struct ib_pd *pd, int pbl_depth) php = to_c4iw_pd(pd); rhp = php->rhp; mhp = kzalloc(sizeof(*mhp), GFP_KERNEL); - if (!mhp) + if (!mhp) { + ret = -ENOMEM; goto err; + } mhp->rhp = rhp; ret = alloc_pbl(mhp, pbl_depth); @@ -730,8 +732,10 @@ struct ib_mr *c4iw_alloc_fast_reg_mr(struct ib_pd *pd, int pbl_depth) mhp->attr.state = 1; mmid = (stag) >> 8; mhp->ibmr.rkey = mhp->ibmr.lkey = stag; - if (insert_handle(rhp, &rhp->mmidr, mhp, mmid)) + if (insert_handle(rhp, &rhp->mmidr, mhp, mmid)) { + ret = -ENOMEM; goto err3; + } PDBG("%s mmid 0x%x mhp %p stag 0x%x\n", __func__, mmid, mhp, stag); return &(mhp->ibmr); |