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

mariux64 · Jun 22, 2015 · c99d49a · c99d49a
2 parents e12be67 + fcd9d31
commit c99d49a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);