summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8995.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-27 18:40:47 +0400
committerMark Brown <broonie@linaro.org>2013-08-27 18:40:47 +0400
commit38f7d75edcf8ced03d03131005ed806bee746699 (patch)
tree1baf728abcc490365f499eef8c1b35b25435da5a /sound/soc/codecs/wm8995.c
parentc22cff947a98ecd10c42974a39ced1819e5c868a (diff)
parent34742cb02bd368c1af3349c041d3e4446f7ac6ef (diff)
downloadlinux-38f7d75edcf8ced03d03131005ed806bee746699.tar.xz
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
-rw-r--r--sound/soc/codecs/wm8995.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 90a65c427541..da2899e6c401 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -549,12 +549,9 @@ static int check_clk_sys(struct snd_soc_dapm_widget *source,
static int wm8995_put_class_w(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
- struct snd_soc_dapm_widget *w = wlist->widgets[0];
- struct snd_soc_codec *codec;
+ struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);
int ret;
- codec = w->codec;
ret = snd_soc_dapm_put_volsw(kcontrol, ucontrol);
wm8995_update_class_w(codec);
return ret;