diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-22 13:25:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-22 13:25:34 +0200 |
| commit | c7988afde761cdb571b4e9e8d2ee741dea4b5389 (patch) | |
| tree | 700cf9b74faa645803744141031ad0d07a3fa423 /sound/soc/codecs/wm5102.c | |
| parent | 57fa8a1e22c5833fb2cae96af68fc39ec21cb017 (diff) | |
| parent | f76b240206156f1d57869cc60264a128d6b6ed2f (diff) | |
Merge tag 'asoc-v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: A couple more updates for v4.2
These were sitting on my laptop.
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
| -rw-r--r-- | sound/soc/codecs/wm5102.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index c5ec519d34be..d097f09e50f2 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1880,6 +1880,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) if (ret) return ret; + ret = snd_soc_add_codec_controls(codec, + arizona_adsp2_rate_controls, 1); + if (ret) + return ret; + arizona_init_spk(codec); arizona_init_gpio(codec); |