36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
|
From 5b72e3d5305930bffc300aa4f2545ba95992c144 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Takashi Iwai <tiwai@suse.de>
|
||
|
|
Date: Tue, 18 Mar 2014 15:23:09 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
src/pcm/pcm_route.c | 4 +---
|
||
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
|
||
|
|
index ab17fa78be2c..ac11bdc8adfd 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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.9.0
|
||
|
|
|