Skip to contentSkip to conversation

ASoC: simple-card: fix mic jack initialization

PATCH In review Stefan Agner 3 participants 3 messages May 15, 2017 – May 19, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: simple-card: fix mic jack initialization

Initialize asoc_simple_card_init_mic with the correct struct asoc_simple_jack.

Fixes 9eac361877b3 ("ASoC: simple-card: add new asoc_simple_jack and use it")
---
 sound/soc/generic/simple-card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/generic/simple-card.c +1 -1
index 2c9dedab5184..bc136d2bd7cd 100644
@@ -202,7 +202,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 	if (ret < 0)
 		return ret;
 
-	ret = asoc_simple_card_init_mic(rtd->card, &priv->hp_jack, PREFIX);
+	ret = asoc_simple_card_init_mic(rtd->card, &priv->mic_jack, PREFIX);
 	if (ret < 0)
 		return ret;
 
Signature · 1 line
2.13.0
maintainer Acked-by on v1 1/1
#1 lore raw

Hi

Quoted 6 lines

Initialize asoc_simple_card_init_mic with the correct struct asoc_simple_jack.

Fixes 9eac361877b3 ("ASoC: simple-card: add new asoc_simple_jack and use it")

---

Quoted 19 lines
 sound/soc/generic/simple-card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/generic/simple-card.c +1 -1
index 2c9dedab5184..bc136d2bd7cd 100644
@@ -202,7 +202,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 	if (ret < 0)
 		return ret;
 
-	ret = asoc_simple_card_init_mic(rtd->card, &priv->hp_jack, PREFIX);
+	ret = asoc_simple_card_init_mic(rtd->card, &priv->mic_jack, PREFIX);
 	if (ret < 0)
 		return ret;
 
Signature · 1 line
2.13.0

Best regards
---
Kuninori Morimoto

maintainer
#2 lore raw

Applied "ASoC: simple-card: fix mic jack initialization" to the asoc tree

In reply to Stefan Agner

The patch

ASoC: simple-card: fix mic jack initialization

has been applied to the asoc tree at

git://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

Quoted 1 line

From f746aa5e8636c83e53bbb2d988bb614f732b2b80 Mon Sep 17 00:00:00 2001

From: Stefan Agner <[email protected]>
Date: Mon, 15 May 2017 14:00:31 -0700
Subject: [PATCH] ASoC: simple-card: fix mic jack initialization

Initialize asoc_simple_card_init_mic with the correct struct asoc_simple_jack.

Fixes 9eac361877b3 ("ASoC: simple-card: add new asoc_simple_jack and use it")
---
 sound/soc/generic/simple-card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/generic/simple-card.c +1 -1
index 2c9dedab5184..bc136d2bd7cd 100644
@@ -202,7 +202,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 	if (ret < 0)
 		return ret;
 
-	ret = asoc_simple_card_init_mic(rtd->card, &priv->hp_jack, PREFIX);
+	ret = asoc_simple_card_init_mic(rtd->card, &priv->mic_jack, PREFIX);
 	if (ret < 0)
 		return ret;
 
Signature · 1 line
2.11.0