summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-03-18 15:23:09 +0100
committerTakashi Iwai <tiwai@suse.de>2014-03-18 15:23:09 +0100
commit5b72e3d5305930bffc300aa4f2545ba95992c144 (patch)
tree74d01fa8b384e790e2c35b7bba75be4189e1b108
parentcbcc78031b676413265719113c7109481fa0242d (diff)
downloadalsa-lib-5b72e3d5305930bffc300aa4f2545ba95992c144.tar.gz
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>
-rw-r--r--src/pcm/pcm_route.c4
1 files changed, 1 insertions, 3 deletions
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;
}