[alsa-devel] [PATCH 2/2] ASoC: Use DAPM context rather than CODEC when constructing sequences

[Jarkko Nikula]

On Fri, 12 Nov 2010 16:01:11 +0000
Mark Brown <broonie at opensource.wolfsonmicro.com> wrote:

> DAPM widgets may be associated with non-CODEC devices so compare based
> on the DAPM context rather than the CODEC pointer.
> 
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/soc-dapm.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> index bc2ec06..5ee93a5 100644
> --- a/sound/soc/soc-dapm.c
> +++ b/sound/soc/soc-dapm.c
> @@ -710,8 +710,8 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
>  		return sort[a->id] - sort[b->id];
>  	if (a->reg != b->reg)
>  		return a->reg - b->reg;
> -	if (a->codec != b->codec)
> -		return (unsigned long)a->codec - (unsigned long)b->codec;
> +	if (a->dapm != b->dapm)
> +		return (unsigned long)a->dapm - (unsigned long)b->dapm;
>  
Definitely, this conversion was missing from DAPM decoupling patch.

Acked-by: Jarkko Nikula <jhnikula at gmail.com>