diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-07 12:13:55 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-16 12:30:37 -0500 |
commit | d207c68dd92455a3d618c37b5a9f0dc598723fd6 (patch) | |
tree | 738e10cbfc149ec01d9c1e0c2d82a129d99ef1f7 /sound | |
parent | 283375cefbf4f91ce51d93d010634c48d0d39044 (diff) |
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 2 insertions, 0 deletions
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, | |||
739 | struct snd_soc_dapm_widget *b, | 739 | struct snd_soc_dapm_widget *b, |
740 | int sort[]) | 740 | int sort[]) |
741 | { | 741 | { |
742 | if (a->codec != b->codec) | ||
743 | return (unsigned long)a - (unsigned long)b; | ||
742 | if (sort[a->id] != sort[b->id]) | 744 | if (sort[a->id] != sort[b->id]) |
743 | return sort[a->id] - sort[b->id]; | 745 | return sort[a->id] - sort[b->id]; |
744 | if (a->reg != b->reg) | 746 | if (a->reg != b->reg) |