diff options
| author | Kevin Lo <kevlo@cvs.openbsd.org> | 2008-08-18 04:28:19 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@cvs.openbsd.org> | 2008-08-18 04:28:19 +0000 |
| commit | 84d74eb3d19ef5fdce30f8170e48d966349c3ca0 (patch) | |
| tree | 8c87feb9b9292ef1cd5db5890b5d9e09d9d663da /sys | |
| parent | 502638cd46b51df8d29ceeb8d0e18f3f91776d64 (diff) | |
use M_NOWAIT instead of M_WAITOK to cause malloc() to return NULL
ok mglocker
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/ehci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 3eb26372a6b..0407f2cd9a5 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.87 2008/08/16 16:47:32 mglocker Exp $ */ +/* $OpenBSD: ehci.c,v 1.88 2008/08/18 04:28:18 kevlo Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -407,7 +407,7 @@ ehci_init(ehci_softc_t *sc) EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0)); sc->sc_softitds = malloc(sc->sc_flsize * sizeof(ehci_soft_itd_t *), - M_USB, M_WAITOK | M_ZERO); + M_USB, M_NOWAIT | M_ZERO); if (sc->sc_softitds == NULL) return (ENOMEM); LIST_INIT(&sc->sc_freeitds); |