Merge branch 'for-3.0' into for-3.1

b5d5f59b · Mark Brown · e12c28a9 · bd7fdbca · b5d5f59b
Commit b5d5f59b authored Jul 07, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/ak4642.c sound/soc/codecs/ak4642.c +1 -1

No files found.
--- 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 */