]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: Fix dapm_seq_compare() for multi-component
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Nov 2010 15:14:55 +0000 (15:14 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:19:32 +0000 (13:19 +0000)
Ensure that we keep all widget powerups in DAPM sequence by making
the CODEC the last thing we compare on rather than the first thing.
Also fix the fact that we're currently comparing the widget pointers
rather than the CODEC pointers when we do the substraction so we
won't get stable results.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-dapm.c

index 7d85c6496afa432cbd9791be5f1a9510e7cb78c7..75ed6491222d1d283d69d5881560a823c958d253 100644 (file)
@@ -683,12 +683,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
                            struct snd_soc_dapm_widget *b,
                            int sort[])
 {
-       if (a->codec != b->codec)
-               return (unsigned long)a - (unsigned long)b;
        if (sort[a->id] != sort[b->id])
                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;
 
        return 0;
 }