diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 02:01:54 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-04 02:01:54 +0400 |
| commit | 3c6c2a997743c48c3ef8abbf3400c4cf6da650fe (patch) | |
| tree | c43ad5239a47e329891861adde67ce0854061fec /sound/soc/codecs/stac9766.c | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| parent | 98d3088e534a2a61f6690b5426909b0c3b57a785 (diff) | |
| download | linux-3c6c2a997743c48c3ef8abbf3400c4cf6da650fe.tar.xz | |
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/stac9766.c')
| -rw-r--r-- | sound/soc/codecs/stac9766.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 982e437799a8..33c0f3d39c87 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -340,6 +340,7 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec) printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION); + codec->control_data = codec; /* we don't use regmap! */ ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) goto codec_err; |