From 0b44da159e685537f3eb54621b7ed30358b21687 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 26 May 2010 05:54:21 +0000
Subject: [PATCH] --- yaml --- r: 199461 b: refs/heads/master c:
 5daf47bb4e708fde32c1856a0d049e3c3d03c36c h: refs/heads/master i:   199459:
 b55468dadfa89533e1753364c45520b646adb975 v: v3

---
 [refs]                | 2 +-
 trunk/net/rds/ib_cm.c | 1 +
 trunk/net/rds/iw_cm.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 761de3d81a98..624a4656bd3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e72e9f3814cb8c1076d627c29cec90b005838ac3
+refs/heads/master: 5daf47bb4e708fde32c1856a0d049e3c3d03c36c
diff --git a/trunk/net/rds/ib_cm.c b/trunk/net/rds/ib_cm.c
index 10ed0d55f759..f68832798db2 100644
--- a/trunk/net/rds/ib_cm.c
+++ b/trunk/net/rds/ib_cm.c
@@ -475,6 +475,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,
 	err = rds_ib_setup_qp(conn);
 	if (err) {
 		rds_ib_conn_error(conn, "rds_ib_setup_qp failed (%d)\n", err);
+		mutex_unlock(&conn->c_cm_lock);
 		goto out;
 	}
 
diff --git a/trunk/net/rds/iw_cm.c b/trunk/net/rds/iw_cm.c
index a9d951b4fbae..b5dd6ac39be8 100644
--- a/trunk/net/rds/iw_cm.c
+++ b/trunk/net/rds/iw_cm.c
@@ -452,6 +452,7 @@ int rds_iw_cm_handle_connect(struct rdma_cm_id *cm_id,
 	err = rds_iw_setup_qp(conn);
 	if (err) {
 		rds_iw_conn_error(conn, "rds_iw_setup_qp failed (%d)\n", err);
+		mutex_unlock(&conn->c_cm_lock);
 		goto out;
 	}