X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=cd327243bb008f912013c0de725b024885d24bf4;hp=8ca3c525a664b3faf307d5c5d66c6886e7a3c8eb;hb=bb5101625c76c3bfa5fe516e6e669a43108ff597;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7 diff --git a/oss_write.c b/oss_write.c index 8ca3c525..cd327243 100644 --- a/oss_write.c +++ b/oss_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Andre Noll + * Copyright (C) 2009-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -157,7 +157,7 @@ err_free: return ret; } -static void oss_post_select(__a_unused struct sched *s, +static int oss_post_select(__a_unused struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); @@ -181,7 +181,7 @@ static void oss_post_select(__a_unused struct sched *s, ret = oss_init(wn, rate, ch, format); if (ret < 0) goto out; - return; + return 0; } btr_merge(btrn, wn->min_iqs); bytes = btr_next_buffer(btrn, &data); @@ -199,9 +199,9 @@ static void oss_post_select(__a_unused struct sched *s, btr_consume(btrn, ret); ret = 0; out: - t->error = ret; if (ret < 0) btr_remove_node(&wn->btrn); + return ret; } __malloc static void *oss_parse_config_or_die(int argc, char **argv)