summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-04-14 03:04:37 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-04-14 03:04:37 +0000
commit19168800e6d0172415d5cad377ec052de7347552 (patch)
tree42f5115becfc9d646048fdfdb9fefd225007505e
parent7b94a73c4c7cae7481aa386315ca8759e366a86b (diff)
WAITOK for the dmamap create for ccbs too
again, only called during autoconf which is a kind of process context.
-rw-r--r--sys/dev/ic/nvme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index 0417ec3dee8..03ab3caffdc 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvme.c,v 1.36 2016/04/14 00:26:38 dlg Exp $ */
+/* $OpenBSD: nvme.c,v 1.37 2016/04/14 03:04:36 dlg Exp $ */
/*
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -970,7 +970,7 @@ nvme_ccbs_alloc(struct nvme_softc *sc, u_int nccbs)
ccb = &sc->sc_ccbs[i];
if (bus_dmamap_create(sc->sc_dmat, sc->sc_mdts, sc->sc_max_sgl,
- sc->sc_mps, sc->sc_mps, BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW,
+ sc->sc_mps, sc->sc_mps, BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW,
&ccb->ccb_dmamap) != 0)
goto free_maps;