From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Henningsson Subject: Re: [PATCH] pcm: route: Don't handle no matching chmap as a serious error Date: Tue, 18 Mar 2014 17:19:29 +0100 Message-ID: <53287211.1040803@canonical.com> References: <1395152876-28480-1-git-send-email-tiwai@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id 0FEDB261AE9 for ; Tue, 18 Mar 2014 17:19:31 +0100 (CET) In-Reply-To: <1395152876-28480-1-git-send-email-tiwai@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Takashi Iwai , alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org On 03/18/2014 03:27 PM, Takashi Iwai wrote: > 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. Hmm, could you give a more specific example? In case the driver does not support channel maps at all, that case is handled in the beginning of the function. So this only happens if the driver supports channel maps, but only non-compatible with the requested map. In which case I believe it's correct that the probing should fail...? > > Signed-off-by: Takashi Iwai > --- > 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; > } > > -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic