From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 717C0626B2; Mon, 4 Mar 2024 21:28:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709587698; cv=none; b=SB+qjLr8P8YMGa8f5iKJZA02gdvPObh/D6wj1f8QN0CYnPlijzbQGrDuMDgeODoQnZcPk8Ri/ocM0D9xm0+cXXoM2ESMPuU/T9yx+aYiD/xOYaCLHiWS2v61hCPn/xD2+Q2iTsTJgMW+WaHo3+FI0tJE9GtaGT5B+1yKa2030Xo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709587698; c=relaxed/simple; bh=/gWaiWn/ZYKPAAe3BBflPYwP5jlCmcRayYfLo6agAbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QSvBKfDcm5OH1N6XzpLFHJ/z+w9AlQT6exLuYzClNcdW2wHfDXEe3e+RCWopP8WEv578XibgYlUDnECBjE+oaqgQkx8MMa+K/SqZ6yi+ijAd6QgH5PwcwnwEM4DBNbHKHaDpk8iKBURxjGwYxwEkqFig6AgCnAD9AcNCThlu244= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EkSBWJAV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EkSBWJAV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05B12C433C7; Mon, 4 Mar 2024 21:28:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709587698; bh=/gWaiWn/ZYKPAAe3BBflPYwP5jlCmcRayYfLo6agAbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EkSBWJAVaZfoSX9ytMFv1AYKShutTsbRs7A2N/UfSOW0jKNHgieNyrM4hO5At7b0e MCRAUoG9b79Xxua77YB4g+VM3P/HDTr/f3E8dgrCDd2v7rZe1zJUiIe8Zaz26VIwXk Fa4dHEh88KX7ChyJ4QTYEW6ktcyaket8y+fQn/Jc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Richard Fitzgerald , Mark Brown , Sasha Levin Subject: [PATCH 6.7 055/162] ASoC: cs35l56: Dont add the same register patch multiple times Date: Mon, 4 Mar 2024 21:22:00 +0000 Message-ID: <20240304211553.611571740@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304211551.833500257@linuxfoundation.org> References: <20240304211551.833500257@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Fitzgerald [ Upstream commit 07687cd0539f8185b6ba0c0afba8473517116d6a ] Move the call to cs35l56_set_patch() earlier in cs35l56_init() so that it only adds the register patch on first-time initialization. The call was after the post_soft_reset label, so every time this function was run to re-initialize the hardware after a reset it would call regmap_register_patch() and add the same reg_sequence again. Signed-off-by: Richard Fitzgerald Fixes: 898673b905b9 ("ASoC: cs35l56: Move shared data into a common data structure") Link: https://msgid.link/r/20240129162737.497-6-rf@opensource.cirrus.com Signed-off-by: Mark Brown Stable-dep-of: eba2eb2495f4 ("ASoC: soc-card: Fix missing locking in snd_soc_card_get_kcontrol()") Signed-off-by: Sasha Levin --- sound/soc/codecs/cs35l56.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index 491da77112c34..ea5d2b2eb82a0 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -1159,6 +1159,10 @@ int cs35l56_init(struct cs35l56_private *cs35l56) if (ret < 0) return ret; + ret = cs35l56_set_patch(&cs35l56->base); + if (ret) + return ret; + /* Populate the DSP information with the revision and security state */ cs35l56->dsp.part = devm_kasprintf(cs35l56->base.dev, GFP_KERNEL, "cs35l56%s-%02x", cs35l56->base.secured ? "s" : "", cs35l56->base.rev); @@ -1197,10 +1201,6 @@ int cs35l56_init(struct cs35l56_private *cs35l56) if (ret) return ret; - ret = cs35l56_set_patch(&cs35l56->base); - if (ret) - return ret; - /* Registers could be dirty after soft reset or SoundWire enumeration */ regcache_sync(cs35l56->base.regmap); -- 2.43.0