Commit d4bdaced authored Apr 11, 2015 by Lars-Peter Clausen Committed by Mark Brown Apr 12, 2015

ASoC: n810: Consistently pass the card DAPM context to n810_ext_control()



Some callers of n810_ext_control() pass the card DAPM context and some pass
the CODEC DAPM context. Given that some of the widgets that are accessed in
the function are in the card's context, always passing it is the obvious
choice.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 7b425f26

sound/soc/omap/n810.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -98,12 +98,11 @@ static int n810_startup(struct snd_pcm_substream *substream)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_codec *codec = rtd->codec;

		snd_pcm_hw_constraint_minmax(runtime,
		SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);

		n810_ext_control(&codec->dapm);
		n810_ext_control(&rtd->card->dapm);
		return clk_prepare_enable(sys_clkout2);
		}

Admin message