Skip to content

Commit

Permalink
Merge branch 'for-3.0' into for-3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Jul 7, 2011
2 parents e12c28a + bd7fdbc commit b5d5f59
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4642.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit b5d5f59

Please sign in to comment.