From: Kuninori Morimoto Date: Thu, 7 Jul 2011 00:58:56 +0000 (-0700) Subject: ASoC: ak4642: fixup snd_soc_update_bits mask for PW_MGMT2 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/linux-imx.git/commitdiff_plain/c7f88b2668a1fe87d6b0497081c03653c44ee80f ASoC: ak4642: fixup snd_soc_update_bits mask for PW_MGMT2 [ upstream commit bd7fdbcaa2d06d446577fd3c9b81847b04469e01 ] mask didn't cover update-data Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org Signed-off-by: Andi Kleen --- diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 7528a54102b5..dc21971d9c83 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -319,7 +319,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); return 0;