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

c99d49a8 · Mark Brown · e12be671 · fcd9d310 · c99d49a8
Commit c99d49a8 authored Jun 22, 2015 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/wm8995.c sound/soc/codecs/wm8995.c +1 -1

No files found.
--- 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);