Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

[sfrench/cifs-2.6.git] / sound / soc / generic / simple-card.c

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index e86c6e16146b7c7636c009da6cf12e7fea7fe783..1df69701eb12885122a4155227b64aeb44bb1089 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -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;