summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-04-11 10:47:57 +0200
committerMark Brown <broonie@kernel.org>2015-04-12 12:45:11 +0100
commitd4bdaced1a81ca2953557f8ecae842b42879fda4 (patch)
treefcbc9b1f4a2d3a3029f4d4120f717316a0a06c8f /sound/soc/omap
parent7b425f264fc2572bea8b15fe97948659507c6a45 (diff)
downloadblackbird-op-linux-d4bdaced1a81ca2953557f8ecae842b42879fda4.tar.gz
blackbird-op-linux-d4bdaced1a81ca2953557f8ecae842b42879fda4.zip
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>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/n810.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 5d7f9cebe041..617eae37581c 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -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);
}
OpenPOWER on IntegriCloud