diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index b6b998cde..1c2043215 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -2176,8 +2176,6 @@ static int srpt_release(struct scst_tgt *scst_tgt)
 
 	scst_tgt_set_tgt_priv(scst_tgt, NULL);
 
-	complete(&sdev->scst_released);
-
 	return 0;
 }
 
@@ -2344,7 +2342,6 @@ static void srpt_add_one(struct ib_device *device)
 		return;
 
 	sdev->device = device;
-	init_completion(&sdev->scst_released);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 	sdev->class_dev.class = &srpt_class;
@@ -2505,8 +2502,6 @@ static void srpt_remove_one(struct ib_device *device)
 	scst_unregister(sdev->scst_tgt);
 	sdev->scst_tgt = NULL;
 
-	wait_for_completion(&sdev->scst_released);
-
 	ib_unregister_event_handler(&sdev->event_handler);
 	ib_destroy_cm_id(sdev->cm_id);
 	ib_destroy_srq(sdev->srq);
diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h
index 8872be8ba..2212769e3 100644
--- a/srpt/src/ib_srpt.h
+++ b/srpt/src/ib_srpt.h
@@ -199,11 +199,6 @@ struct srpt_device {
 	spinlock_t spinlock;
 	struct srpt_port port[2];
 	struct ib_event_handler event_handler;
-	/*
-	 * scst_released is used to postpone srpt_remove_one() until the SCST
-	 * core has notified the ib_srpt module about driver release.
-	 */
-	struct completion scst_released;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 	/* per-port srpt-<portname> device instance. */
 	struct class_device class_dev;