diff options
| author | cg <cg@FreeBSD.org> | 2002-11-25 17:17:43 +0000 |
|---|---|---|
| committer | cg <cg@FreeBSD.org> | 2002-11-25 17:17:43 +0000 |
| commit | c9457db52b78b8fe2844cb837ee11d32cb013d0b (patch) | |
| tree | ac1448d81f09f0d496c1b9ce490a1df51856353d /sys/dev/sound/pcm/feeder_fmt.c | |
| parent | 79ac90c6dbdb26a4402c5fb31a4a94d6e72e133e (diff) | |
| download | FreeBSD-src-c9457db52b78b8fe2844cb837ee11d32cb013d0b.zip FreeBSD-src-c9457db52b78b8fe2844cb837ee11d32cb013d0b.tar.gz | |
various fixes to eliminate locking warnings
Approved by: re
Reviewed by: orion
Diffstat (limited to 'sys/dev/sound/pcm/feeder_fmt.c')
| -rw-r--r-- | sys/dev/sound/pcm/feeder_fmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c index 059d5b7..b4fa4f3 100644 --- a/sys/dev/sound/pcm/feeder_fmt.c +++ b/sys/dev/sound/pcm/feeder_fmt.c @@ -209,7 +209,7 @@ FEEDER_DECLARE(feeder_8to16le, 0, NULL); static int feed_16to8_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return (f->data)? 0 : ENOMEM; } @@ -318,7 +318,7 @@ FEEDER_DECLARE(feeder_monotostereo16, 0, NULL); static int feed_stereotomono8_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return (f->data)? 0 : ENOMEM; } @@ -363,7 +363,7 @@ FEEDER_DECLARE(feeder_stereotomono8, 1, NULL); static int feed_stereotomono16_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return (f->data)? 0 : ENOMEM; } |
