diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
| commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
| tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /sound/soc/codecs/wm8994.c | |
| parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
| parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
Merge branch 'fix/hda' into topic/hda
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 0db59c3aa5d4..830dfdd66c5f 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
| @@ -3903,6 +3903,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
| 3903 | return -ENOMEM; | 3903 | return -ENOMEM; |
| 3904 | snd_soc_codec_set_drvdata(codec, wm8994); | 3904 | snd_soc_codec_set_drvdata(codec, wm8994); |
| 3905 | 3905 | ||
| 3906 | codec->reg_cache = &wm8994->reg_cache; | ||
| 3907 | |||
| 3906 | wm8994->pdata = dev_get_platdata(codec->dev->parent); | 3908 | wm8994->pdata = dev_get_platdata(codec->dev->parent); |
| 3907 | wm8994->codec = codec; | 3909 | wm8994->codec = codec; |
| 3908 | 3910 | ||