From 675866f03eeafd459c2559d0c75d954591544aba Mon Sep 17 00:00:00 2001
From: Steve Wise <swise@opengridcomputing.com>
Date: Thu, 20 May 2010 16:57:54 -0500
Subject: [PATCH] --- yaml --- r: 198423 b: refs/heads/master c:
 841dba9a5a0dbced4b4bc240f444d47f30ba6724 h: refs/heads/master i:   198421:
 16ecb16d9cea344aae02bfcf6cc321bb8f0bacfe   198419:
 b0970b3bb9edbf98dcacb333def5d1eace3d9da3   198415:
 8cde03cac7e2915c75c6f226ba689f8fb41a1936 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/infiniband/hw/cxgb4/mem.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 142f7ab006d3..d95f6e3179ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ec45b923446d484eb39434e18d354666426e606
+refs/heads/master: 841dba9a5a0dbced4b4bc240f444d47f30ba6724
diff --git a/trunk/drivers/infiniband/hw/cxgb4/mem.c b/trunk/drivers/infiniband/hw/cxgb4/mem.c
index e54ff6d25691..993ed1fe7bf6 100644
--- a/trunk/drivers/infiniband/hw/cxgb4/mem.c
+++ b/trunk/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);