summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ic/nvme.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index d3f8b142fff..0e3dc93cdc4 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvme.c,v 1.34 2016/04/14 00:12:51 dlg Exp $ */
+/* $OpenBSD: nvme.c,v 1.35 2016/04/14 00:19:57 dlg Exp $ */
/*
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -1083,8 +1083,14 @@ int
nvme_intr(void *xsc)
{
struct nvme_softc *sc = xsc;
+ int rv = 0;
- return (nvme_q_complete(sc, sc->sc_admin_q));
+ if (nvme_q_complete(sc, sc->sc_q))
+ rv = 1;
+ if (nvme_q_complete(sc, sc->sc_admin_q))
+ rv = 1;
+
+ return (rv);
}
struct nvme_dmamem *