Skip to content
Snippets Groups Projects
Commit b5d5f59b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents e12c28a9 bd7fdbca
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sound/soc/codecs/ak4642.c
+ 1
− 1
View file @ b5d5f59b
...@@ -357,7 +357,7 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -357,7 +357,7 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
default: default:
return -EINVAL; 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); snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko);
/* format type */ /* format type */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment