diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 00:03:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 00:03:59 +0100 |
| commit | b8f861586c9c2433b22f81e933845cb8aaa18d9e (patch) | |
| tree | b075dd0c9156ce45da4ab3099b222cae1163d3bc /sound/soc/codecs/wm8958-dsp2.c | |
| parent | Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next (diff) | |
| parent | Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| download | linux-b8f861586c9c2433b22f81e933845cb8aaa18d9e.tar.xz linux-b8f861586c9c2433b22f81e933845cb8aaa18d9e.zip | |
Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8958-dsp2.c')
| -rw-r--r-- | sound/soc/codecs/wm8958-dsp2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c index d4248e00160e..7ac2e511403c 100644 --- a/sound/soc/codecs/wm8958-dsp2.c +++ b/sound/soc/codecs/wm8958-dsp2.c @@ -944,7 +944,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) for (i = 0; i < pdata->num_mbc_cfgs; i++) wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name; - wm8994->mbc_enum.max = pdata->num_mbc_cfgs; + wm8994->mbc_enum.items = pdata->num_mbc_cfgs; wm8994->mbc_enum.texts = wm8994->mbc_texts; ret = snd_soc_add_codec_controls(wm8994->hubs.codec, @@ -973,7 +973,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) for (i = 0; i < pdata->num_vss_cfgs; i++) wm8994->vss_texts[i] = pdata->vss_cfgs[i].name; - wm8994->vss_enum.max = pdata->num_vss_cfgs; + wm8994->vss_enum.items = pdata->num_vss_cfgs; wm8994->vss_enum.texts = wm8994->vss_texts; ret = snd_soc_add_codec_controls(wm8994->hubs.codec, @@ -1003,7 +1003,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) for (i = 0; i < pdata->num_vss_hpf_cfgs; i++) wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name; - wm8994->vss_hpf_enum.max = pdata->num_vss_hpf_cfgs; + wm8994->vss_hpf_enum.items = pdata->num_vss_hpf_cfgs; wm8994->vss_hpf_enum.texts = wm8994->vss_hpf_texts; ret = snd_soc_add_codec_controls(wm8994->hubs.codec, @@ -1034,7 +1034,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) for (i = 0; i < pdata->num_enh_eq_cfgs; i++) wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name; - wm8994->enh_eq_enum.max = pdata->num_enh_eq_cfgs; + wm8994->enh_eq_enum.items = pdata->num_enh_eq_cfgs; wm8994->enh_eq_enum.texts = wm8994->enh_eq_texts; ret = snd_soc_add_codec_controls(wm8994->hubs.codec, |