Index: nvme.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/nvme.c,v
diff -u -p -r1.117 nvme.c
--- nvme.c	4 Jun 2024 20:31:35 -0000	1.117
+++ nvme.c	16 Jun 2024 00:07:43 -0000
@@ -1550,14 +1550,18 @@ int
 nvme_intr(void *xsc)
 {
 	struct nvme_softc *sc = xsc;
-	int rv = 0;
+	int rv;
+	int aqrv;
 
-	if (nvme_q_complete(sc, sc->sc_q))
-		rv = 1;
-	if (nvme_q_complete(sc, sc->sc_admin_q))
-		rv = 1;
+	rv = nvme_q_complete(sc, sc->sc_q);
+	if (rv == 1)
+		return (1);
 
-	return (rv);
+	aqrv = nvme_q_complete(sc, sc->sc_admin_q);
+	if (aqrv == 1)
+		return (1);
+
+	return (rv ? rv : aqrv);
 }
 
 int