From 015c34bf1540a97f8920bf9e3bdff0e80293a053 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 19 Mar 2014 10:54:08 +0100 Subject: 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 --- src/pcm/pcm_route.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.1