1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index d026764c7e9c..cfd57b4abd03 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1183,9 +1183,10 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
         struct sockaddr_in *sin;
         int ret = 0;
 
-        memset(&event, 0, sizeof event);
-        atomic_inc(&id_priv->dev_remove);
+        if (cma_disable_remove(id_priv, CMA_CONNECT))
+                return 0;
 
+        memset(&event, 0, sizeof event);
         switch (iw_event->event) {
         case IW_CM_EVENT_CLOSE:
                 event.event = RDMA_CM_EVENT_DISCONNECTED;