diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-07 12:54:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-07 12:54:19 -0400 |
| commit | b5d5f59be2ac586db2db0ac324215a714961f364 (patch) | |
| tree | e373d033b621c636a888f4e0ea9d9ee4d8884fbc | |
| parent | e12c28a98f0517a8868ac80ef4585487b3e81853 (diff) | |
| parent | bd7fdbcaa2d06d446577fd3c9b81847b04469e01 (diff) | |
Merge branch 'for-3.0' into for-3.1
| -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) | |||
| 357 | default: | 357 | default: |
| 358 | return -EINVAL; | 358 | return -EINVAL; |
| 359 | } | 359 | } |
| 360 | snd_soc_update_bits(codec, PW_MGMT2, MS, data); | 360 | snd_soc_update_bits(codec, PW_MGMT2, MS | MCKO | PMPLL, data); |
| 361 | snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko); | 361 | snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko); |
| 362 | 362 | ||
| 363 | /* format type */ | 363 | /* format type */ |