---

yaml --- r: 116836 b: refs/heads/master c: dc35fac h: refs/heads/master v: v3
git-mirror · Oct 15, 2008 · ebd8679 · ebd8679
1 parent b730b02
commit ebd8679
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;