X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=311a514dc86ff6bfb01abf53d16a75672827af12;hp=1a837e5700c7cfdb7e86951f8ae999645c49bd67;hb=refs%2Fheads%2Fnext;hpb=e3a7e12639c34fd86d48a072beb48add8c498d09 diff --git a/oss_write.c b/oss_write.c index 1a837e57..4ea85afa 100644 --- a/oss_write.c +++ b/oss_write.c @@ -101,7 +101,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, { int ret, format; unsigned ch, rate; - struct private_oss_write_data *powd = para_calloc(sizeof(*powd)); + struct private_oss_write_data *powd = zalloc(sizeof(*powd)); const char *dev = WRITE_CMD_OPT_STRING_VAL(OSS, DEVICE, wn->lpr); PARA_INFO_LOG("opening %s\n", dev); @@ -218,7 +218,7 @@ static int oss_post_monitor(__a_unused struct sched *s, void *context) bytes = btr_next_buffer(btrn, &data); frames = bytes / powd->bytes_per_frame; if (!frames) { /* eof and less than a single frame available */ - ret = -E_WRITE_COMMON_EOF; + ret = -E_EOF; goto out; } ret = 0;