Skip to content

Commit

Permalink
ASoC: n810: Consistently pass the card DAPM context to n810_ext_contr…
Browse files Browse the repository at this point in the history
…ol()

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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Apr 12, 2015
1 parent 7b425f2 commit d4bdace
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions sound/soc/omap/n810.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit d4bdace

Please sign in to comment.