Commit 7331ea47 authored Jan 15, 2015 by Lars-Peter Clausen Committed by Mark Brown Jan 15, 2015

ASoC: mioa701_wm9713: Fix speaker event



Commit f6b2a045 ("ASoC: pxa: mioa701_wm9713: Convert to table based DAPM
setup") converted the driver to register the board level DAPM elements with
the card's DAPM context rather than the CODEC's DAPM context. The change
overlooked that the speaker widget event callback accesses the widget's
codec field which is only valid if the widget has been registered in a CODEC
DAPM context. This patch modifies the callback to take an alternative route
to get the CODEC.

Fixes: f6b2a045 ("ASoC: pxa: mioa701_wm9713: Convert to table based DAPM
setup")
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 0201e505

sound/soc/pxa/mioa701_wm9713.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static int rear_amp_power(struct snd_soc_codec *codec, int power)
		static int rear_amp_event(struct snd_soc_dapm_widget *widget,
		struct snd_kcontrol *kctl, int event)
		{
		struct snd_soc_codec *codec = widget->codec;
		struct snd_soc_codec *codec = widget->dapm->card->rtd[0].codec;

		return rear_amp_power(codec, SND_SOC_DAPM_EVENT_ON(event));
		}