From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 18 Mar 2014 14:23:09 +0000 (+0100)
Subject: pcm: route: Don't handle no matching chmap as a serious error
X-Git-Tag: v1.0.28~18
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=5b72e3d5305930bffc300aa4f2545ba95992c144;p=alsa-lib.git

pcm: route: Don't handle no matching chmap as a serious error

When find_matching_chmap() returns an error for the non-matching
chmap, the caller, snd_pcm_route_open(), also returns an error
although it shouldn't be handled as the fatal error.  This results in
the probe error with PulseAudio and it gives no real output in the
end.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index ab17fa78..ac11bdc8 100644
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -940,10 +940,8 @@ static int find_matching_chmap(snd_pcm_t *spcm, snd_pcm_chmap_t *tt_chmap,
 
 	snd_pcm_free_chmaps(chmaps);
 
-	if (*found_chmap == NULL) {
+	if (*found_chmap == NULL)
 		SNDERR("Found no matching channel map");
-		return -EINVAL;
-	}
 	return 0;
 }