From patchwork Sat Jan 23 22:36:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 8098191 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D114DBEEE5 for ; Sat, 23 Jan 2016 22:39:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA67320394 for ; Sat, 23 Jan 2016 22:39:21 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0E99820381 for ; Sat, 23 Jan 2016 22:39:20 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 292E6261AC3; Sat, 23 Jan 2016 23:39:19 +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, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 596512605FF; Sat, 23 Jan 2016 23:38:20 +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 293FA26065F; Sat, 23 Jan 2016 23:38:17 +0100 (CET) Received: from emh07.mail.saunalahti.fi (emh07.mail.saunalahti.fi [62.142.5.117]) by alsa0.perex.cz (Postfix) with ESMTP id 468112604FC for ; Sat, 23 Jan 2016 23:38:08 +0100 (CET) Received: from localhost.localdomain (85-76-167-245-nat.elisa-mobile.fi [85.76.167.245]) by emh07.mail.saunalahti.fi (Postfix) with ESMTP id AFD0A4022; Sun, 24 Jan 2016 00:38:07 +0200 (EET) From: Aaro Koskinen To: Jason Cooper , Andrew Lunn , Mark Brown , Arnaud Pouliquen , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Martin Michlmayr , Rick Thomas Date: Sun, 24 Jan 2016 00:36:40 +0200 Message-Id: <1453588600-14831-3-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1453588600-14831-1-git-send-email-aaro.koskinen@iki.fi> References: <1453588600-14831-1-git-send-email-aaro.koskinen@iki.fi> Cc: Aaro Koskinen Subject: [alsa-devel] [PATCH 2/2] ASoC: simple-card: don't fail if sysclk setting is not supported 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 Commit e22579713ae1 ("ASoC: simple card: set cpu-dai sysclk with mclk-fs") added sysclk / SND_SOC_CLOCK_OUT setting, that makes asoc_simple_card_hw_params fail if the operation is not supported, although the intention clearly was to ignore ENOTSUPP. Fix it. The patch fixes audio playback on Kirkwood / OpenRD client, where the following errors are seen: asoc-simple-card sound: ASoC: machine hw_params failed: -524 alsa-lib: /alsa-lib-1.0.28/src/pcm/pcm_hw.c:327:(snd_pcm_hw_hw_params) SNDRV_PCM_IOCTL_HW_PARAMS failed (-524): Unknown error 524 Fixes: e22579713ae1 ("ASoC: simple card: set cpu-dai sysclk with mclk-fs") Signed-off-by: Aaro Koskinen Reviewed-by: Andrew Lunn --- sound/soc/generic/simple-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 54c3320..ff6fcd9 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -100,7 +100,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, if (ret && ret != -ENOTSUPP) goto err; } - + return 0; err: return ret; }