Index: nvme.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/nvme.c,v
retrieving revision 1.32
diff -u -p -r1.32 nvme.c
--- nvme.c	27 Feb 2018 12:59:53 -0000	1.32
+++ nvme.c	14 Mar 2018 21:28:09 -0000
@@ -1149,12 +1149,6 @@ nvme_q_complete(struct nvme_softc *sc, s
 
 	mutex_exit(&q->q_cq_mtx);
 
-	if (rv) {
-		mutex_enter(&q->q_ccb_mtx);
-		q->q_nccbs_avail += rv;
-		mutex_exit(&q->q_ccb_mtx);
-	}
-
 	return rv;
 }
 
@@ -1431,6 +1425,7 @@ nvme_ccb_put(struct nvme_queue *q, struc
 	ccb->ccb_cookie = (void *)NVME_CCB_FREE;
 #endif
 	SIMPLEQ_INSERT_HEAD(&q->q_ccb_list, ccb, ccb_entry);
+	q->q_nccbs_avail++;
 	mutex_exit(&q->q_ccb_mtx);
 }