From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 19 Mar 2014 09:54:08 +0000 (+0100)
Subject: Revert "pcm: route: Don't handle no matching chmap as a serious error"
X-Git-Tag: v1.0.28~15
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=015c34bf1540a97f8920bf9e3bdff0e80293a053;p=alsa-lib.git

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>
---

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;
 }