summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-07 09:54:19 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-07 09:54:19 -0700
commitb5d5f59be2ac586db2db0ac324215a714961f364 (patch)
treee373d033b621c636a888f4e0ea9d9ee4d8884fbc /sound/soc
parente12c28a98f0517a8868ac80ef4585487b3e81853 (diff)
parentbd7fdbcaa2d06d446577fd3c9b81847b04469e01 (diff)
downloadop-kernel-dev-b5d5f59be2ac586db2db0ac324215a714961f364.zip
op-kernel-dev-b5d5f59be2ac586db2db0ac324215a714961f364.tar.gz
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/ak4642.c2
1 files changed, 1 insertions, 1 deletions
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 @@ 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 */
OpenPOWER on IntegriCloud