From: Mark Brown <broonie@kernel.org>
Date: Thu, 6 Nov 2025 17:13:06 +0000 (+0000)
Subject: ASoC: Merge up fixes
X-Git-Tag: v6.19-rc1~156^2~3^2~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47d98d432f19030faf06d4b2ca7fc7493057cae1;p=thirdparty%2Fkernel%2Flinux.git

ASoC: Merge up fixes

There is some overlap with the cs4271 driver.
---

47d98d432f19030faf06d4b2ca7fc7493057cae1
diff --cc sound/soc/codecs/cs4271.c
index a24e926ba2823,ead447a5da7f8..77dfc83a3c013
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@@ -602,7 -587,7 +602,8 @@@ static int cs4271_component_probe(struc
  				 CS4271_MODE2_PDN | CS4271_MODE2_CPEN,
  				 CS4271_MODE2_PDN | CS4271_MODE2_CPEN);
  	if (ret < 0)
 -		goto err_disable_regulator;
 +		goto err_disable_clk;
++
  	ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
  				 CS4271_MODE2_PDN, 0);
  	if (ret < 0)