X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=alsa_write.c;h=11fc58a45608f73d4aa4c16c617a6f65e08d0476;hb=d3ea3458f92072729234b722e9ea6f51640f421e;hp=658183eacafca7ba9385177185b72392cf78d3d0;hpb=158e22fed53d462f8c7cb8ab527f81cc8e89a22b;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index 658183ea..11fc58a4 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -332,17 +332,13 @@ again:
 		pad->channels = conf->channels_arg;
 		if (!conf->samplerate_given) { /* config option trumps btr_exec */
 			int32_t rate;
-			ret = get_btr_samplerate(btrn, &rate);
-			if (ret < 0)
-				goto err;
-			pad->samplerate = rate;
+			if (get_btr_samplerate(btrn, &rate) >= 0)
+				pad->samplerate = rate;
 		}
 		if (!conf->channels_given) {
 			int32_t ch;
-			ret = get_btr_channels(btrn, &ch);
-			if (ret < 0)
-				goto err;
-			pad->channels = ch;
+			if (get_btr_channels(btrn, &ch) >= 0)
+				pad->channels = ch;
 		}
 		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
 		ret = 1;