From 58ae1671f3fb2be5afc124135fb4b5a9dd07e434 Mon Sep 17 00:00:00 2001
From: Vu Pham <vu@mellanox.com>
Date: Mon, 26 Nov 2012 11:57:47 +0100
Subject: [PATCH] --- yaml --- r: 343682 b: refs/heads/master c:
 55d93898a14528a5d4199ba572bea1f0bec5870e h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/infiniband/ulp/srp/ib_srp.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0daf2cf511fb..2b40ac6efc87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73aa89ed9e2bebf0c3fff4504e6dff1421b5c819
+refs/heads/master: 55d93898a14528a5d4199ba572bea1f0bec5870e
diff --git a/trunk/drivers/infiniband/ulp/srp/ib_srp.c b/trunk/drivers/infiniband/ulp/srp/ib_srp.c
index 85771eba9c80..84d9298ed989 100644
--- a/trunk/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/trunk/drivers/infiniband/ulp/srp/ib_srp.c
@@ -481,12 +481,9 @@ static void srp_disconnect_target(struct srp_target_port *target)
 	if (srp_change_conn_state(target, false)) {
 		/* XXX should send SRP_I_LOGOUT request */
 
-		init_completion(&target->done);
 		if (ib_send_cm_dreq(target->cm_id, NULL, 0)) {
 			shost_printk(KERN_DEBUG, target->scsi_host,
 				     PFX "Sending CM DREQ failed\n");
-		} else {
-			wait_for_completion(&target->done);
 		}
 	}
 }
@@ -1664,7 +1661,6 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
 		shost_printk(KERN_ERR, target->scsi_host,
 			     PFX "connection closed\n");
 
-		comp = 1;
 		target->status = 0;
 		break;