1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 5d11f8601599..4f5dd66da39d 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -1305,7 +1305,8 @@ err:
 
         /* 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;