diff options
| author | kevlo <kevlo@FreeBSD.org> | 2007-03-07 05:28:42 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2007-03-07 05:28:42 +0000 |
| commit | 518c2d5e63acff4068f71503008107453a4d3d14 (patch) | |
| tree | 704d951a98eeb45c2ca27d1b6b226f3add979495 | |
| parent | 519f61f9957d9a7307fe381d04f1ae9ebbf6137f (diff) | |
| download | FreeBSD-src-518c2d5e63acff4068f71503008107453a4d3d14.zip FreeBSD-src-518c2d5e63acff4068f71503008107453a4d3d14.tar.gz | |
Use M_NOWAIT instead of M_WAITOK to cause malloc() to return NULL.
| -rw-r--r-- | sys/dev/sound/pci/ds1.c | 2 | ||||
| -rw-r--r-- | sys/dev/sound/pci/emu10k1.c | 2 | ||||
| -rw-r--r-- | sys/dev/sound/pci/emu10kx-pcm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index b2b81c1..c9f0428 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -943,7 +943,7 @@ ds_pci_attach(device_t dev) struct ac97_info *codec = NULL; char status[SND_STATUSLEN]; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) { + if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { device_printf(dev, "cannot allocate softc\n"); return ENXIO; } diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 3dae698..68b89d8 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -1981,7 +1981,7 @@ emu_pci_attach(device_t dev) int i, gotmic; char status[SND_STATUSLEN]; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) { + if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { device_printf(dev, "cannot allocate softc\n"); return ENXIO; } diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index 7ba00c1..2ee69ff 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -1004,7 +1004,7 @@ emu_pcm_attach(device_t dev) uint32_t inte, ipr; uintptr_t route, r, is_emu10k1; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) { + if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { device_printf(dev, "cannot allocate softc\n"); return (ENXIO); } |
