]> git.alsa-project.org Git - alsa-lib.git/commitdiff
pcm: route: Don't handle no matching chmap as a serious error
authorTakashi Iwai <tiwai@suse.de>
Tue, 18 Mar 2014 14:23:09 +0000 (15:23 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 18 Mar 2014 14:23:09 +0000 (15:23 +0100)
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>
src/pcm/pcm_route.c

index ab17fa78be2cc737a173f213c2292cc1c27f4d22..ac11bdc8adfdd0e272dcbf3d0cfad9d8acf9323e 100644 (file)
@@ -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;
 }