Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293312
b: refs/heads/master
c: 4c6c0b5
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Feb 8, 2012
1 parent 107d158 commit 779ad85
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 6d6761aa9b36e2da18669b9948ee6849064a84e9
refs/heads/master: 4c6c0b5eee572a24345fdd1fac6aa670cc937a3a
7 changes: 5 additions & 2 deletions trunk/sound/soc/codecs/wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -2634,6 +2634,9 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream,
int adctl3 = 0;

wm8962->bclk = snd_soc_params_to_bclk(params);
if (params_channels(params) == 1)
wm8962->bclk *= 2;

wm8962->lrclk = params_rate(params);

for (i = 0; i < ARRAY_SIZE(sr_vals); i++) {
Expand Down Expand Up @@ -3008,14 +3011,14 @@ static struct snd_soc_dai_driver wm8962_dai = {
.name = "wm8962",
.playback = {
.stream_name = "Playback",
.channels_min = 2,
.channels_min = 1,
.channels_max = 2,
.rates = WM8962_RATES,
.formats = WM8962_FORMATS,
},
.capture = {
.stream_name = "Capture",
.channels_min = 2,
.channels_min = 1,
.channels_max = 2,
.rates = WM8962_RATES,
.formats = WM8962_FORMATS,
Expand Down

0 comments on commit 779ad85

Please sign in to comment.