From ebd867998be9dfa25a233b5db896c6198f5b00ed Mon Sep 17 00:00:00 2001
From: Steve Wise <swise@opengridcomputing.com>
Date: Wed, 15 Oct 2008 10:50:34 -0700
Subject: [PATCH] --- yaml --- r: 116836 b: refs/heads/master c:
 dc35fac9e936c6cc6ad825fc7e4455468d10adc6 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/infiniband/core/ucma.c        | 4 ++--
 trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b3ba43c86b93..2430ca68aa7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aea938f54ca785ce3bea67a8948698225c6ca58
+refs/heads/master: dc35fac9e936c6cc6ad825fc7e4455468d10adc6
diff --git a/trunk/drivers/infiniband/core/ucma.c b/trunk/drivers/infiniband/core/ucma.c
index 4346a24568fb..3ddacf39b7ba 100644
--- a/trunk/drivers/infiniband/core/ucma.c
+++ b/trunk/drivers/infiniband/core/ucma.c
@@ -904,8 +904,8 @@ static ssize_t ucma_join_multicast(struct ucma_file *file,
 
 	mutex_lock(&file->mut);
 	mc = ucma_alloc_multicast(ctx);
-	if (!mc) {
-		ret = -ENOMEM;
+	if (IS_ERR(mc)) {
+		ret = PTR_ERR(mc);
 		goto err1;
 	}
 
diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c b/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c
index c325c44807e8..44e936e48a31 100644
--- a/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1942,6 +1942,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
 fail3:
 	cxgb3_free_atid(ep->com.tdev, ep->atid);
 fail2:
+	cm_id->rem_ref(cm_id);
 	put_ep(&ep->com);
 out:
 	return err;