diff mbox series

ASoC: dapm: Don't use prefix for regulator name

Message ID 20221025150149.113129-1-paul@crapouillou.net
State New
Headers
Series ASoC: dapm: Don't use prefix for regulator name |

Commit Message

Paul Cercueil Oct. 25, 2022, 3:01 p.m. UTC 
  When a component has a prefix, and uses a SND_SOC_DAPM_REGULATOR_SUPPLY,
the name of the regulator should not use the prefix, otherwise it won't
be properly matched in the DT/ACPI.

Fixes: 3caac759681e ("ASoC: soc-dapm.c: fixup snd_soc_dapm_new_control_unlocked() error handling")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 sound/soc/soc-dapm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Oct. 26, 2022, 6:07 p.m. UTC | #1 
On Tue, 25 Oct 2022 16:01:49 +0100, Paul Cercueil wrote:
> When a component has a prefix, and uses a SND_SOC_DAPM_REGULATOR_SUPPLY,
> the name of the regulator should not use the prefix, otherwise it won't
> be properly matched in the DT/ACPI.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: dapm: Don't use prefix for regulator name
      commit: 1683d3282f240336a2b4b6b541d435facfe8bbb6

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
Paul Cercueil Nov. 7, 2022, 9:52 a.m. UTC | #2 
Hi Mark,

Le mer. 26 oct. 2022 à 19:07:28 +0100, Mark Brown <broonie@kernel.org> 
a écrit :
> On Tue, 25 Oct 2022 16:01:49 +0100, Paul Cercueil wrote:
>>  When a component has a prefix, and uses a 
>> SND_SOC_DAPM_REGULATOR_SUPPLY,
>>  the name of the regulator should not use the prefix, otherwise it 
>> won't
>>  be properly matched in the DT/ACPI.
>> 
>> 
> 
> Applied to
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 
> for-next

Small reminder that this is a fix for a bug introduced in -rc1, so it 
should be queued for the next RC.

Cheers,
-Paul

> Thanks!
> 
> [1/1] ASoC: dapm: Don't use prefix for regulator name
>       commit: 1683d3282f240336a2b4b6b541d435facfe8bbb6
> 
> 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
Mark Brown Nov. 7, 2022, 12:57 p.m. UTC | #3 
On Mon, Nov 07, 2022 at 09:52:24AM +0000, Paul Cercueil wrote:
> Le mer. 26 oct. 2022 à 19:07:28 +0100, Mark Brown <broonie@kernel.org> a

> > Applied to
> > 
> >    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
> > for-next

> Small reminder that this is a fix for a bug introduced in -rc1, so it should
> be queued for the next RC.

This is already queued as a fix.
Paul Cercueil Nov. 7, 2022, 1:01 p.m. UTC | #4 
Le lun. 7 nov. 2022 à 12:57:05 +0000, Mark Brown <broonie@kernel.org> 
a écrit :
> On Mon, Nov 07, 2022 at 09:52:24AM +0000, Paul Cercueil wrote:
>>  Le mer. 26 oct. 2022 à 19:07:28 +0100, Mark Brown 
>> <broonie@kernel.org> a
> 
>>  > Applied to
>>  >
>>  >    
>> https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
>>  > for-next
> 
>>  Small reminder that this is a fix for a bug introduced in -rc1, so 
>> it should
>>  be queued for the next RC.
> 
> This is already queued as a fix.

Ok, thanks. I didn't see it in -rc4 and thought that it was queued for 
6.2 instead.

Cheers,
-Paul
diff mbox series

Patch

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d515e7a78ea8..879cf1be67a9 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3645,7 +3645,7 @@  snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
 
 	switch (w->id) {
 	case snd_soc_dapm_regulator_supply:
-		w->regulator = devm_regulator_get(dapm->dev, w->name);
+		w->regulator = devm_regulator_get(dapm->dev, widget->name);
 		if (IS_ERR(w->regulator)) {
 			ret = PTR_ERR(w->regulator);
 			goto request_failed;