]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Merge up fixes
authorMark Brown <broonie@kernel.org>
Thu, 6 Nov 2025 17:13:06 +0000 (17:13 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 6 Nov 2025 17:13:06 +0000 (17:13 +0000)
There is some overlap with the cs4271 driver.

1  2 
sound/soc/codecs/cs4271.c
sound/soc/codecs/da7213.c
sound/soc/codecs/tas2783-sdw.c
sound/soc/sdw_utils/soc_sdw_utils.c

index a24e926ba2823302a624be5e4272c4f454adfa8c,ead447a5da7f83bf36090cfca224c1aa0692f1f5..77dfc83a3c01319f1e12ccef4463e4ab99b763f4
@@@ -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)
Simple merge
Simple merge
Simple merge