From patchwork Tue Mar 18 14:27:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 3848341 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BC6B8BF540 for ; Tue, 18 Mar 2014 14:32:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E43CE20270 for ; Tue, 18 Mar 2014 14:32:22 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id DA3CB203AC for ; Tue, 18 Mar 2014 14:32:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id BC618261A95; Tue, 18 Mar 2014 15:32:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E1DA5261AA3; Tue, 18 Mar 2014 15:29:58 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id F2A68261AA3; Tue, 18 Mar 2014 15:29:57 +0100 (CET) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 3AA522619F4 for ; Tue, 18 Mar 2014 15:27:57 +0100 (CET) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F27EA75011; Tue, 18 Mar 2014 14:27:56 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Date: Tue, 18 Mar 2014 15:27:56 +0100 Message-Id: <1395152876-28480-1-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 1.9.0 Cc: David Henningsson Subject: [alsa-devel] [PATCH] pcm: route: Don't handle no matching chmap as a serious error X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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; }