diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-07 09:54:19 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-07 09:54:19 -0700 |
| commit | b5d5f59be2ac586db2db0ac324215a714961f364 (patch) | |
| tree | e373d033b621c636a888f4e0ea9d9ee4d8884fbc /sound/soc/codecs | |
| parent | ASoC: pxa2xx-pcm: remove unused variable 'dai' (diff) | |
| parent | ASoC: ak4642: fixup snd_soc_update_bits mask for PW_MGMT2 (diff) | |
| download | linux-dev-b5d5f59be2ac586db2db0ac324215a714961f364.tar.xz linux-dev-b5d5f59be2ac586db2db0ac324215a714961f364.zip | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/ak4642.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 4be0570e3f1f..65f46047b1cb 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -357,7 +357,7 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) default: return -EINVAL; } - snd_soc_update_bits(codec, PW_MGMT2, MS, data); + snd_soc_update_bits(codec, PW_MGMT2, MS | MCKO | PMPLL, data); snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko); /* format type */ |