diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 00:01:54 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 00:01:54 +0200 |
| commit | 3c6c2a997743c48c3ef8abbf3400c4cf6da650fe (patch) | |
| tree | c43ad5239a47e329891861adde67ce0854061fec /sound/soc/codecs/mc13783.c | |
| parent | Linux 3.6-rc1 (diff) | |
| parent | ASoC: core: Fix check before defaulting to regmap (diff) | |
| download | linux-3c6c2a997743c48c3ef8abbf3400c4cf6da650fe.tar.xz linux-3c6c2a997743c48c3ef8abbf3400c4cf6da650fe.zip | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.6
ASoC: Additional updates for 3.6
A few updates for issues discovered during the merge window, the main
one being the fix for the issues with defaulting to use of regmap
without properly checking if there was I/O in place already.
Diffstat (limited to 'sound/soc/codecs/mc13783.c')
| -rw-r--r-- | sound/soc/codecs/mc13783.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 6276e352125f..8f726c063f42 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -581,6 +581,8 @@ static int mc13783_probe(struct snd_soc_codec *codec) { struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); + codec->control_data = priv->mc13xxx; + mc13xxx_lock(priv->mc13xxx); /* these are the reset values */ |