From 7c667f142c721fada8f3c9b0aedf332e6a1abf8e Mon Sep 17 00:00:00 2001
From: Steve Wise <swise@opengridcomputing.com>
Date: Fri, 10 Sep 2010 11:14:48 -0500
Subject: [PATCH] --- yaml --- r: 217711 b: refs/heads/master c:
 af93fb5dcc6b1cba5fd0861d349b3f9c93144bc0 h: refs/heads/master i:   217709:
 a07938a9a0f3f676364157de4831b4454c164d7f   217707:
 c6c36416fe304964343740de801d30ce78b2cab6   217703:
 a29360e731b7d5772abe4746bc321cc031d350a6   217695:
 65ad1679f79d1aca97c2b8805851ef6de12868ee v: v3

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

diff --git a/[refs] b/[refs]
index b8abef849fce..02c6174bcd4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8e081a1bf11c5cbac5f2f9f53c040be61d7b29e
+refs/heads/master: af93fb5dcc6b1cba5fd0861d349b3f9c93144bc0
diff --git a/trunk/drivers/infiniband/hw/cxgb4/qp.c b/trunk/drivers/infiniband/hw/cxgb4/qp.c
index 5d11f8601599..4f5dd66da39d 100644
--- a/trunk/drivers/infiniband/hw/cxgb4/qp.c
+++ b/trunk/drivers/infiniband/hw/cxgb4/qp.c
@@ -1305,7 +1305,8 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
 
 	/* disassociate the LLP connection */
 	qhp->attr.llp_stream_handle = NULL;
-	ep = qhp->ep;
+	if (!ep)
+		ep = qhp->ep;
 	qhp->ep = NULL;
 	qhp->attr.state = C4IW_QP_STATE_ERROR;
 	free = 1;