diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 05:24:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 05:24:37 -0400 |
| commit | c99d49a8f81fb35e67b0ffa45f320a75e0b5639d (patch) | |
| tree | 0201293c916547972907924a7e178f25319099c2 | |
| parent | e12be671ad4dcc4be7ef9511a3759fb8f3b5857f (diff) | |
| parent | fcd9d310a5f55ca081c996a96c561225be382ba5 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8995' into asoc-next
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 687c4dd7ec99..505b65f5734f 100644 --- 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, | |||
| 1930 | dai->id + 1, freq); | 1930 | dai->id + 1, freq); |
| 1931 | break; | 1931 | break; |
| 1932 | case WM8995_SYSCLK_MCLK2: | 1932 | case WM8995_SYSCLK_MCLK2: |
| 1933 | wm8995->sysclk[dai->id] = WM8995_SYSCLK_MCLK1; | 1933 | wm8995->sysclk[dai->id] = WM8995_SYSCLK_MCLK2; |
| 1934 | wm8995->mclk[1] = freq; | 1934 | wm8995->mclk[1] = freq; |
| 1935 | dev_dbg(dai->dev, "AIF%d using MCLK2 at %uHz\n", | 1935 | dev_dbg(dai->dev, "AIF%d using MCLK2 at %uHz\n", |
| 1936 | dai->id + 1, freq); | 1936 | dai->id + 1, freq); |