3 files changed, 7 insertions, 8 deletions
diff --git a/src/platform/posix/posix_epdesc.c b/src/platform/posix/posix_epdesc.c
index dfb750d4..69026051 100644
--- a/src/platform/posix/posix_epdesc.c
+++ b/src/platform/posix/posix_epdesc.c
@@ -469,11 +469,7 @@ nni_epdesc_connect_cb(nni_posix_pfd *pfd, int events, void *arg)
 	nni_mtx_lock(&ed->mtx);
 	if ((ed->closed) || ((aio = nni_list_first(&ed->connectq)) == NULL) ||
 	    (pfd != ed->pfd)) {
-		// Spurious completion.  Ignore it, but discard the PFD.
-		if (ed->pfd == pfd) {
-			ed->pfd = NULL;
-		}
-		nni_posix_pfd_fini(pfd);
+		// Spurious completion.  Just ignore it.
 		nni_mtx_unlock(&ed->mtx);
 		return;
 	}
diff --git a/src/platform/posix/posix_pollq_epoll.c b/src/platform/posix/posix_pollq_epoll.c
index a8d8693a..9c1ae682 100644
--- a/src/platform/posix/posix_pollq_epoll.c
+++ b/src/platform/posix/posix_pollq_epoll.c
@@ -93,6 +93,10 @@ nni_posix_pfd_init(nni_posix_pfd **pfdp, int fd)
 	if ((pfd = NNI_ALLOC_STRUCT(pfd)) == NULL) {
 		return (NNG_ENOMEM);
 	}
+	nni_mtx_init(&pfd->mtx);
+	nni_cv_init(&pfd->cv, &pq->mtx);
+
+	nni_mtx_lock(&pfd->mtx);
 	pfd->pq      = pq;
 	pfd->fd      = fd;
 	pfd->cb      = NULL;
@@ -101,9 +105,8 @@ nni_posix_pfd_init(nni_posix_pfd **pfdp, int fd)
 	pfd->closing = false;
 	pfd->closed  = false;
 
-	nni_mtx_init(&pfd->mtx);
-	nni_cv_init(&pfd->cv, &pq->mtx);
 	NNI_LIST_NODE_INIT(&pfd->node);
+	nni_mtx_unlock(&pfd->mtx);
 
 	// notifications disabled to begin with
 	ev.events   = 0;
diff --git a/src/platform/posix/posix_pollq_kqueue.c b/src/platform/posix/posix_pollq_kqueue.c
index 36ced3ff..c118d528 100644
--- a/src/platform/posix/posix_pollq_kqueue.c
+++ b/src/platform/posix/posix_pollq_kqueue.c
@@ -276,9 +276,9 @@ nni_posix_pollq_destroy(nni_posix_pollq *pq)
 {
 	if (pq->kq >= 0) {
 		close(pq->kq);
-		pq->kq = -1;
 	}
 	nni_thr_fini(&pq->thr);
+	pq->kq = -1;
 
 	nni_posix_pollq_reap(pq);