git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
ak4642.c
diff --git
a/sound/soc/codecs/ak4642.c
b/sound/soc/codecs/ak4642.c
index
4be0570
..
65f4604
100644
(file)
--- 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;
}
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 */
snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko);
/* format type */