summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-03-19 10:54:08 +0100
committerTakashi Iwai <tiwai@suse.de>2014-03-19 10:55:52 +0100
commit015c34bf1540a97f8920bf9e3bdff0e80293a053 (patch)
treee2619848ce2fb180e60b3d08dac38ec1f9ad47a0
parentdbe6d7f86902dbbe2ff276b7a6524c084893772f (diff)
downloadalsa-lib-015c34bf1540a97f8920bf9e3bdff0e80293a053.tar.gz
Revert "pcm: route: Don't handle no matching chmap as a serious error"
This reverts commit 5b72e3d5305930bffc300aa4f2545ba95992c144. With the previous fixes, it's no longer needed as a workaround for regression with PulseAudio. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/pcm/pcm_route.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index 599fc3eb..49567ea1 100644
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -943,8 +943,10 @@ 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;
}