diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-11-03 18:20:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-11-03 18:20:53 +0100 |
| commit | 6bcbf64ace40d6833622d85701218a8bb7a4f207 (patch) | |
| tree | a8db5d361115448647c18b8eb403911ef5aba617 /sound/soc/codecs/wm8940.c | |
| parent | 51e4152a969aa6d2306492ebf143932dcb535c9b (diff) | |
| parent | 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
| -rw-r--r-- | sound/soc/codecs/wm8940.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index dc5cb315085..de9ec9b8b7d 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -621,7 +621,7 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai, switch (div_id) { case WM8940_BCLKDIV: - reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFEF3; + reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3; ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2)); break; case WM8940_MCLKDIV: |