diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2009-12-06 12:31:11 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2009-12-06 12:31:11 +0000 |
| commit | 67bdc53784acc350cd4f9b507594e7745827e466 (patch) | |
| tree | 8a1ce772c2311e2d802b85d7ef77aa2c2fe6c138 /sys | |
| parent | 223f01267eb9fe860f8d0beaa1342511d46aba60 (diff) | |
change M_WAITOK --> M_WAITOK|M_CANFAIL
with input from marco@
"that i like" marco@
ok dlg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ami.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 2dc755491c1..185499d0a10 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.197 2009/08/12 14:15:05 dlg Exp $ */ +/* $OpenBSD: ami.c,v 1.198 2009/12/06 12:31:10 chl Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -2535,7 +2535,7 @@ ami_create_sensors(struct ami_softc *sc) return (1); sc->sc_sensors = malloc(sizeof(struct ksensor) * sc->sc_nunits, - M_DEVBUF, M_WAITOK|M_ZERO); + M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO); if (sc->sc_sensors == NULL) return (1); @@ -2557,7 +2557,7 @@ ami_create_sensors(struct ami_softc *sc) sensor_attach(&sc->sc_sensordev, &sc->sc_sensors[i]); } - sc->sc_bd = malloc(sizeof(*sc->sc_bd), M_DEVBUF, M_WAITOK); + sc->sc_bd = malloc(sizeof(*sc->sc_bd), M_DEVBUF, M_WAITOK|M_CANFAIL); if (sc->sc_bd == NULL) goto bad; |