ASoC: pxa: Pass correct DAPM context to {corgi,poodle,spitz}_ext_control
When calling {corgi,poodle,spitz}_ext_control() from the startup callback we pass the CODEC's DAPM context instead of the card's DAPM context. This is not a problem per se since all the DAPM functions in ext_control() fallback to widgets from other DAPM contexts, but passing the card's context is more consistent. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Родитель
9b87a5b0d4
Коммит
e14de47ac9
|
@ -97,10 +97,9 @@ static void corgi_ext_control(struct snd_soc_dapm_context *dapm)
|
|||
static int corgi_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
corgi_ext_control(&codec->dapm);
|
||||
corgi_ext_control(&rtd->card->dapm);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -74,10 +74,9 @@ static void poodle_ext_control(struct snd_soc_dapm_context *dapm)
|
|||
static int poodle_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
poodle_ext_control(&codec->dapm);
|
||||
poodle_ext_control(&rtd->card->dapm);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -106,10 +106,9 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
|
|||
static int spitz_startup(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
|
||||
/* check the jack status at stream startup */
|
||||
spitz_ext_control(&codec->dapm);
|
||||
spitz_ext_control(&rtd->card->dapm);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче