X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ao_write.c;h=037b92993325539552ddd625b881a843aa57c5a9;hb=a0cd2ac59b891751067512dce77cf6223104932f;hp=92f62f8f87cf9bedd4a1b50942326f5e9ef2029c;hpb=938a5d68c9bbdf422119fc9bcca2549e24b9a4e0;p=paraslash.git

diff --git a/ao_write.c b/ao_write.c
index 92f62f8f..037b9299 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -87,7 +87,7 @@ static int aow_set_sample_format(unsigned sample_rate, unsigned channels,
 		case SF_U8:
 		case SF_U16_LE:
 		case SF_U16_BE:
-			return -E_AO_BAD_SAMPLE_FORMAT;
+			return -E_BAD_SAMPLE_FORMAT;
 		case SF_S8:
 			/* no need to set byte_format */
 			result->bits = 8;
@@ -357,9 +357,15 @@ static int aow_post_select(__a_unused struct sched *s, void *context)
 			goto remove_btrn;
 		if (ret == 0)
 			return 0;
-		get_btr_sample_rate(wn->btrn, &rate);
-		get_btr_channels(wn->btrn, &ch);
-		get_btr_sample_format(wn->btrn, &format);
+		ret = get_btr_sample_rate(wn->btrn, &rate);
+		if (ret < 0)
+			goto remove_btrn;
+		ret = get_btr_channels(wn->btrn, &ch);
+		if (ret < 0)
+			goto remove_btrn;
+		ret = get_btr_sample_format(wn->btrn, &format);
+		if (ret < 0)
+			goto remove_btrn;
 		ret = aow_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto remove_btrn;