diff options
author | Stefan Agner <stefan@agner.ch> | 2017-05-15 14:00:31 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-13 19:48:02 +0200 |
commit | 581ec36f26ad69b70ec3ed4ee552bd38b961d917 (patch) | |
tree | bab7f07e5448cd748885309c397b42ab131a1eb1 /sound/soc | |
parent | c4c3203761117c041bb457d05201935131e351f1 (diff) | |
download | linux-stable-581ec36f26ad69b70ec3ed4ee552bd38b961d917.tar.gz linux-stable-581ec36f26ad69b70ec3ed4ee552bd38b961d917.tar.bz2 linux-stable-581ec36f26ad69b70ec3ed4ee552bd38b961d917.zip |
ASoC: simple-card: fix mic jack initialization
[ Upstream commit f746aa5e8636c83e53bbb2d988bb614f732b2b80 ]
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")
Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/generic/simple-card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index dd88c2cb6470..48804e4ab530 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -201,7 +201,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; |