diff options
author | orion <orion@FreeBSD.org> | 2003-03-05 14:48:28 +0000 |
---|---|---|
committer | orion <orion@FreeBSD.org> | 2003-03-05 14:48:28 +0000 |
commit | fd018b2fba2125e438fef94277c85b091d75b1e9 (patch) | |
tree | dd97bbd94e389464a15271a18a1edd791a724f92 /sys/dev/sound/pcm/feeder_rate.c | |
parent | ca36cee9d879e68a864f07f8a6d26f9d9b0a29a1 (diff) | |
download | FreeBSD-src-fd018b2fba2125e438fef94277c85b091d75b1e9.zip FreeBSD-src-fd018b2fba2125e438fef94277c85b091d75b1e9.tar.gz |
Back out last commit, which is fine in theory, but ignores the fact
that a lock is held whilst the allocations are made (M_WAITOK -> M_NOWAIT).
Diffstat (limited to 'sys/dev/sound/pcm/feeder_rate.c')
-rw-r--r-- | sys/dev/sound/pcm/feeder_rate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 4dfff2e..540ff97 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -249,7 +249,7 @@ feed_rate_init(struct pcm_feeder *f) { struct feed_rate_info *info; - info = malloc(sizeof(*info), M_RATEFEEDER, M_WAITOK | M_ZERO); + info = malloc(sizeof(*info), M_RATEFEEDER, M_NOWAIT | M_ZERO); info->src = DSP_DEFAULT_SPEED; info->dst = DSP_DEFAULT_SPEED; info->channels = 2; |