[alsa-devel] [PATCH] ASoC: Ensure we only run Speyside WM8962 bias level callbacks once

Liam Girdwood lrg at ti.com
Mon Aug 22 12:23:23 CEST 2011


On 21/08/11 12:20, Mark Brown wrote:
> We get called once per DAPM context but only need to run once. When DAPM
> was serialized this was a series of noops but now it can run in parallel
> we need to take proper care.
> 
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/samsung/speyside_wm8962.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c
> index 753e1c2..3820a6b 100644
> --- a/sound/soc/samsung/speyside_wm8962.c
> +++ b/sound/soc/samsung/speyside_wm8962.c
> @@ -23,6 +23,9 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
>  	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
>  	int ret;
>  
> +	if (dapm->dev != codec_dai->dev)
> +		return 0;
> +
>  	switch (level) {
>  	case SND_SOC_BIAS_PREPARE:
>  		if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
> @@ -57,6 +60,9 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
>  	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
>  	int ret;
>  
> +	if (dapm->dev != codec_dai->dev)
> +		return 0;
> +
>  	switch (level) {
>  	case SND_SOC_BIAS_STANDBY:
>  		ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,

Acked-by: Liam Girdwood <lrg at ti.com>


More information about the Alsa-devel mailing list