Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283658
b: refs/heads/master
c: 49fa4d9
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed Oct 24, 2011
1 parent 03a3dc9 commit c121b20
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 753ddf52153b60be924109df3bebab0cd60b3297
refs/heads/master: 49fa4d9b5aeafb985abe8cb8cdf6432690c49ad3
4 changes: 2 additions & 2 deletions trunk/sound/soc/codecs/wm8940.c
Original file line number Diff line number Diff line change
Expand Up @@ -627,8 +627,8 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 5));
break;
case WM8940_OPCLKDIV:
reg = snd_soc_read(codec, WM8940_ADDCNTRL) & 0xFFCF;
ret = snd_soc_write(codec, WM8940_ADDCNTRL, reg | (div << 4));
reg = snd_soc_read(codec, WM8940_GPIO) & 0xFFCF;
ret = snd_soc_write(codec, WM8940_GPIO, reg | (div << 4));
break;
}
return ret;
Expand Down

0 comments on commit c121b20

Please sign in to comment.