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

diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 687c4dd7ec994a26c466bfaa77864417839739ec..505b65f5734f102f6fe1fa4dca1a579ad828d971 100644 (file)
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1930,7 +1930,7 @@ static int wm8995_set_dai_sysclk(struct snd_soc_dai *dai,
                        dai->id + 1, freq);
                break;
        case WM8995_SYSCLK_MCLK2:
-               wm8995->sysclk[dai->id] = WM8995_SYSCLK_MCLK1;
+               wm8995->sysclk[dai->id] = WM8995_SYSCLK_MCLK2;
                wm8995->mclk[1] = freq;
                dev_dbg(dai->dev, "AIF%d using MCLK2 at %uHz\n",
                        dai->id + 1, freq);