diff options
author | Orion Hodson <orion@FreeBSD.org> | 2003-03-05 14:48:28 +0000 |
---|---|---|
committer | Orion Hodson <orion@FreeBSD.org> | 2003-03-05 14:48:28 +0000 |
commit | a7576e2e4b38781dbae543125ce5e5a8d43b4ff2 (patch) | |
tree | dd97bbd94e389464a15271a18a1edd791a724f92 /sys/dev/sound/pcm/feeder.c | |
parent | 9d3570325db8d774b8f35d3746a0c29406d1b379 (diff) | |
download | src-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.c')
-rw-r--r-- | sys/dev/sound/pcm/feeder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 851957439a35..0c2f7847cefe 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -59,7 +59,7 @@ feeder_register(void *p) KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte = malloc(sizeof(*fte), M_FEEDER, M_NOWAIT | M_ZERO); if (fte == NULL) { printf("can't allocate memory for root feeder: %s\n", fc->name); @@ -84,7 +84,7 @@ feeder_register(void *p) i = 0; while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) { /* printf("adding feeder %s, %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); */ - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte = malloc(sizeof(*fte), M_FEEDER, M_NOWAIT | M_ZERO); if (fte == NULL) { printf("can't allocate memory for feeder '%s', %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); @@ -137,7 +137,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) struct pcm_feeder *f; int err; - f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_WAITOK | M_ZERO); + f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_NOWAIT | M_ZERO); if (f == NULL) return NULL; |