From patchwork Tue Oct 23 09:53:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149435 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp481044ljp; Tue, 23 Oct 2018 02:54:08 -0700 (PDT) X-Google-Smtp-Source: AJdET5d42L9kQKiVaRhjzuA/IkQYKPMV/IQQ9+D5sPpGz3Fotte4cmyu14xq+7miypii2Hh4L0mK X-Received: by 2002:a5d:64c1:: with SMTP id y1-v6mr17584362wrv.92.1540288448524; Tue, 23 Oct 2018 02:54:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540288448; cv=none; d=google.com; s=arc-20160816; b=Maw8FMxs9mBPWBUuPnWaOZToJPylu1LpDq3MeFmpgZyFozwBr8ijb4QZiSXVZ2rUJN GF/uXojPS4q4U9yJo0R9xzWe8671e9qjvAi7edGXsbYw+Cg7dcQch+RG/2NCz5S3082Q FjZ/rxf5pBW/UxrtAYnYZjacQ6Ywlzw4eVYjlCRP/DKKelJzgRI57qatcStpWt/5aMnx M/6iJzQsoiO8VY8vjeL8PeF2d73b9fBuP5DC+wYiRO7o3ioA5NynSSxAuKmti0Sn1eWe hY3KlvbAqsqcl58twcU7Z7Z9HWUebyb8KE9nNnPoKOLH4nSjH58d33Y/V7Q81gn2Dzln is6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=6DC2HioHTuxKyddD/wL+AFkHs747jj2XV+HeiflQ6kU=; b=sQ6d1FjOOnZVEIENhlA/LxJFohyzTxZbcg0EnGWPpBDpis9rVzUiDyoP/boewJRSPK mXpZLSbkuU2sV+tvbOaB12PqMVZ/jRG4zfQzb2dQwfuNQHEsQ96un34SFqBtqUUPju81 AqgU6N8s0wF4cxUyyWRTIsyW39Se9tuiAqDUIGwQxkTk36TeAu8sDXbLrbkIOCgAAm87 sU0LLNAY2SIcB64h5vUVEyPVrpKxv5fFDY6hntBQgPpHYDEc2hq7XpLVhZXmS08/3Drt y9FKxjMpDsPPD9LiUlkl9ng1XGFcjLFGu8p3cUNTB4iebJfEQhPvOBLazEgqKF8FgGlH ZY7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=C3q1mUdl; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id w6-v6si627667wrk.192.2018.10.23.02.54.08; Tue, 23 Oct 2018 02:54:08 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=C3q1mUdl; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4096C2675BA; Tue, 23 Oct 2018 11:54:06 +0200 (CEST) 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 8FB642675BB; Tue, 23 Oct 2018 11:54:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 0D2862675B4 for ; Tue, 23 Oct 2018 11:54:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=r11TmnrN0STucqqrcj06gKKo7FzgwdebMiVuJW9H/mQ=; b=C3q1mUdl2wlX vjOzDK3QTsfclYm94Mc2PEDRQrnT/QXeMn4URd4bKZTDb04qRt8UEd0oU4XGevyjwFYVOTO+xGZVD 3FItAZlU1ZKG8wNjAQTucJZHsksOh4I+rwYe72zB6S7IMlYiSleUfyNIygzqSbFYtJWl6IFbfUrWv y6/lE=; Received: from [185.7.230.215] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gEtNs-0007PT-Sb; Tue, 23 Oct 2018 09:53:56 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 02CB9440078; Tue, 23 Oct 2018 11:53:55 +0200 (CEST) From: Mark Brown To: Olivier Moysan In-Reply-To: <1540221046-11812-3-git-send-email-olivier.moysan@st.com> Message-Id: <20181023095356.02CB9440078@finisterre.ee.mobilebroadband> Date: Tue, 23 Oct 2018 11:53:55 +0200 (CEST) Cc: alsa-devel@alsa-project.org, olivier.moysan@st.com, alexandre.torgue@st.com, linux-kernel@vger.kernel.org, arnaud.pouliquen@st.com, tiwai@suse.com, lgirdwood@gmail.com, broonie@kernel.org, mcoquelin.stm32@gmail.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, benjamin.gaignard@st.com Subject: [alsa-devel] Applied "ASoC: stm32: sai: fix master clock naming" to the asoc tree 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 The patch ASoC: stm32: sai: fix master clock naming has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 6be0f96d799f487f05eb412d362d5a1747d665c2 Mon Sep 17 00:00:00 2001 From: Olivier Moysan Date: Mon, 22 Oct 2018 17:10:46 +0200 Subject: [PATCH] ASoC: stm32: sai: fix master clock naming Fixes: 8307b2afd386 ("ASoC: stm32: sai: set sai as mclk clock provider") Fix warning issued by strncat when bound equals to source length. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown --- sound/soc/stm/stm32_sai_sub.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.19.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 31d22abd3204..ea05cc91aa05 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -404,12 +404,11 @@ static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai) * String after "_" char is stripped in parent name. */ p = mclk_name; - while (*s && *s != '_' && (i < (SAI_MCLK_NAME_LEN - 6))) { + while (*s && *s != '_' && (i < (SAI_MCLK_NAME_LEN - 7))) { *p++ = *s++; i++; } - STM_SAI_IS_SUB_A(sai) ? - strncat(p, "a_mclk", 6) : strncat(p, "b_mclk", 6); + STM_SAI_IS_SUB_A(sai) ? strcat(p, "a_mclk") : strcat(p, "b_mclk"); mclk->hw.init = CLK_HW_INIT(mclk_name, pname, &mclk_ops, 0); mclk->sai_data = sai;