summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/stac9766.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 21:33:12 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 21:33:12 +0100
commitcbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch)
treea7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/codecs/stac9766.c
parentASoC: Fix a memory leak in alc5623_i2c_probe error path (diff)
parentASoC: Restore WM8994 volatile and readable register operations (diff)
downloadlinux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.xz
linux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/stac9766.c')
-rw-r--r--sound/soc/codecs/stac9766.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 7f2773038242..78b2b50271e2 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
.reg_cache_size = sizeof(stac9766_reg),
.reg_word_size = sizeof(u16),
.reg_cache_step = 2,
+ .reg_cache_default = stac9766_reg,
};
static __devinit int stac9766_probe(struct platform_device *pdev)