aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound/pcm/feeder_rate.c
diff options
context:
space:
mode:
authorOrion Hodson <orion@FreeBSD.org>2003-03-05 14:48:28 +0000
committerOrion Hodson <orion@FreeBSD.org>2003-03-05 14:48:28 +0000
commita7576e2e4b38781dbae543125ce5e5a8d43b4ff2 (patch)
treedd97bbd94e389464a15271a18a1edd791a724f92 /sys/dev/sound/pcm/feeder_rate.c
parent9d3570325db8d774b8f35d3746a0c29406d1b379 (diff)
downloadsrc-a7576e2e4b38781dbae543125ce5e5a8d43b4ff2.tar.gz
src-a7576e2e4b38781dbae543125ce5e5a8d43b4ff2.zip
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).
Notes
Notes: svn path=/head/; revision=111909
Diffstat (limited to 'sys/dev/sound/pcm/feeder_rate.c')
-rw-r--r--sys/dev/sound/pcm/feeder_rate.c2
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 4dfff2ef64c1..540ff979ede1 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;