aboutsummaryrefslogtreecommitdiff
path: root/net/rds/ib_cm.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-31 00:10:35 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-31 00:10:35 -0700
commit92b4522f72916ff2675060e29e4b24cf26ab59ce (patch)
tree8424a1c550a98ce09f127425fde9b7b5f2f5027a /net/rds/ib_cm.c
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
parent2903037400a26e7c0cc93ab75a7d62abfacdf485 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/rds/ib_cm.c')
-rw-r--r--net/rds/ib_cm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 10ed0d55f759..f68832798db2 100644
--- a/net/rds/ib_cm.c
+++ b/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;
}