From patchwork Thu Jul 19 16:57:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 142365 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1961761ljj; Thu, 19 Jul 2018 09:58:08 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcs8TvM8EpDhWRSkJqgdFaKEdytBwASKEQ3LZl9D+36ppC6ccAcC6VJxH8O8ZJp+ZsLIW5i X-Received: by 2002:a1c:8a0f:: with SMTP id m15-v6mr4817900wmd.33.1532019488249; Thu, 19 Jul 2018 09:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532019488; cv=none; d=google.com; s=arc-20160816; b=GVmT9/cKOFlJIUAO2XHZAm51nAn6SygHr3Eu4rrxBJA7jfGG4vE2ZYrQi809WpcCgN mnzzSGX/nf/69KUq43JAFkp9MD5SWIxTclMexeTL/93islKoTJaB5zqWI2kpofjXO7I8 4QeoqMt7ZkpzP78iL6RIGGSXL68jLm6UrQkJDIJ8r2GlK/nokajXgUYdYy1xr5XLvkSm jDSxwAooDAALBXOraD179CfQLH5epnSsN2KWJZwXlIk6mg7JK3A6QokUwi/veQ5oFUOK uDdv2LYYMQVr/5ZINsXj2RbAr9dgZ5lTLTknaZGY7obBmsWnG8645zPzYaa8Rx670UwE bkMA== 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:arc-authentication-results; bh=mWRX3+LiloExs+Nx7Jdl5KE9QTp3+airmNchgM+E7ew=; b=ppWVUkhf2mfqTpmYtXRBo6+ohxPFe5+8TVQTMELNadN/uoIOYNnjbD+/uEtc6/EArk EZjPpaHhV59hB5f7147q2epL1uzYxJyla3nzp9yvNa7mVCE2ebjBhMCzM/J6kVwMzV7k DuzNc/bvrV/dLPoM3NWBCJNV7xYeRvNR+PrN+kanRwNY112KQfBzxKeKpi/LopyNgoG9 VaVAIes6M/3QjY6a5E940Hg329u13UTGMBM4vKv1vyTf1xUG5Kgxd9Z7ws7QuAEAxc4Y ogFmuOX9OzgScl8JzFrY2cWhkc77HjXGjnol21weKoYDobdDQ55xxHW5vTBn52d7yoAB xyMA== 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=QQZcPSMO; 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 c18-v6si3489612wmb.117.2018.07.19.09.58.08; Thu, 19 Jul 2018 09:58: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=QQZcPSMO; 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 9233D267770; Thu, 19 Jul 2018 18:57:53 +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 D683D267750; Thu, 19 Jul 2018 18:57:50 +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, SPF_PASS 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 2D4FA267762 for ; Thu, 19 Jul 2018 18:57:48 +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=OnH/HAXVI/VuOtEU4xBRYcytoGRReDnOPINt48rl19g=; b=QQZcPSMOY9Jd zurVeoFzknB0Xdmzr5TEXjzy2pVTFR0Dr0YavV4ehcEc4MIIJflQeV22V2I1Iv6eYTPhFzbrPbcOE xEb7OMdNqtNo1IELJC8dy+qiZwtzbJydBvrIMbbdgetSEOh4OHjTp6BhRLgLuiS3/1Uv8LrlBswjp WQSXU=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fgCFN-0007Jg-Lz; Thu, 19 Jul 2018 16:57:45 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fgCFN-0005WS-7s; Thu, 19 Jul 2018 17:57:45 +0100 From: Mark Brown To: Charles Keepax In-Reply-To: <20180719105039.28312-2-ckeepax@opensource.cirrus.com> Message-Id: Date: Thu, 19 Jul 2018 17:57:45 +0100 Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, lgirdwood@gmail.com, stuarth@opensource.cirrus.com, rf@opensource.cirrus.com, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: wm_adsp: Take prefix into account in control name length" 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: wm_adsp: Take prefix into account in control name length 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 b7ede5af62ab6bfad0980fad58e82d3fb56866df Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Thu, 19 Jul 2018 11:50:36 +0100 Subject: [PATCH] ASoC: wm_adsp: Take prefix into account in control name length Currently when creating ALSA control names for the DSP the length of any prefix applied to the CODEC is not taken into account. Whilst this is mostly harmless it does result in ALSA doing the truncation of the control names and printing a warning. It is better to have the driver do the truncation so it can truncate from the start of parameter name itself to give a greater chance of the result maintain a unique name. Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/codecs/wm_adsp.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 99108d18de8d..eec73c98a141 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1343,6 +1343,9 @@ static int wm_adsp_create_control(struct wm_adsp *dsp, int avail = SNDRV_CTL_ELEM_ID_NAME_MAXLEN - ret - 2; int skip = 0; + if (dsp->component->name_prefix) + avail -= strlen(dsp->component->name_prefix) + 1; + if (subname_len > avail) skip = subname_len - avail;