From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 7 Dec 2009 17:13:55 +0000 (+0000)
Subject: ASoC: Sort DAPM sequences by CODEC as well
X-Git-Tag: firefly_0821_release~9833^2~1382^2~7^2~254
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d207c68dd92455a3d618c37b5a9f0dc598723fd6;p=firefly-linux-kernel-4.4.55.git

ASoC: Sort DAPM sequences by CODEC as well

In preparation for multiple device support.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 4cf58911f3b3..de22c2f1842e 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -739,6 +739,8 @@ 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)