diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-17 18:59:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-17 18:59:19 +0000 |
| commit | 3df94756fe9026c6386ebd10501c2df85df3dbee (patch) | |
| tree | f87c3c801f02ab6c4281624933f33b2ee3f32cea /sound/soc/codecs/wm8994.c | |
| parent | ASoC: Use DAPM context rather than CODEC when constructing sequences (diff) | |
| parent | ASoC: davinci: fixes for multi-component (diff) | |
| download | linux-dev-3df94756fe9026c6386ebd10501c2df85df3dbee.tar.xz linux-dev-3df94756fe9026c6386ebd10501c2df85df3dbee.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index f7dea3d34a3e..bfdb7daeed2d 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3905,6 +3905,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) return -ENOMEM; snd_soc_codec_set_drvdata(codec, wm8994); + codec->reg_cache = &wm8994->reg_cache; + wm8994->pdata = dev_get_platdata(codec->dev->parent); wm8994->codec = codec; |