| commit | b5d5f59be2ac586db2db0ac324215a714961f364 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Jul 07 09:54:19 2011 -0700 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Jul 07 09:54:19 2011 -0700 |
| tree | e373d033b621c636a888f4e0ea9d9ee4d8884fbc | |
| parent | e12c28a98f0517a8868ac80ef4585487b3e81853 [diff] | |
| parent | bd7fdbcaa2d06d446577fd3c9b81847b04469e01 [diff] |
Merge branch 'for-3.0' into for-3.1
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 4be0570..65f4604 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c
@@ -357,7 +357,7 @@ 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 */