diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-05 18:34:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-06 05:52:01 -0400 |
commit | ed6a27723979cfffab62c450baba4f75ebcbda78 (patch) | |
tree | ad6b79c5cc155f8b1459495c906a8b19e79e4455 /sound | |
parent | 087ee0934e23c8dce0f6a0f237f919efdbbb4285 (diff) |
ASoC: wm8994: Fix class W controls
Commit 6e0650 (ASoC: wm8994: Use SOC_SINGLE_EXT() instead of open-coding
it) went too far and converted a DAPM control to use SOC_SINGLE_EXT()
which crashes. Revert that portion of the patch.
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 24131a7f9390..c99b6da79efd 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -1433,7 +1433,7 @@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994_DAC2_RIGHT_MIXER_ROUTING, | |||
1433 | 1433 | ||
1434 | #define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \ | 1434 | #define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \ |
1435 | SOC_SINGLE_EXT(xname, reg, shift, max, invert, \ | 1435 | SOC_SINGLE_EXT(xname, reg, shift, max, invert, \ |
1436 | snd_soc_get_volsw, wm8994_put_class_w) | 1436 | snd_soc_dapm_get_volsw, wm8994_put_class_w) |
1437 | 1437 | ||
1438 | static int wm8994_put_class_w(struct snd_kcontrol *kcontrol, | 1438 | static int wm8994_put_class_w(struct snd_kcontrol *kcontrol, |
1439 | struct snd_ctl_elem_value *ucontrol) | 1439 | struct snd_ctl_elem_value *ucontrol) |