diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-07 17:13:55 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-16 17:30:37 +0000 |
commit | d207c68dd92455a3d618c37b5a9f0dc598723fd6 (patch) | |
tree | 738e10cbfc149ec01d9c1e0c2d82a129d99ef1f7 /sound/soc/soc-dapm.c | |
parent | 283375cefbf4f91ce51d93d010634c48d0d39044 (diff) | |
download | kernel_samsung_crespo-d207c68dd92455a3d618c37b5a9f0dc598723fd6.zip kernel_samsung_crespo-d207c68dd92455a3d618c37b5a9f0dc598723fd6.tar.gz kernel_samsung_crespo-d207c68dd92455a3d618c37b5a9f0dc598723fd6.tar.bz2 |
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/soc/soc-dapm.c')
-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 4cf5891..de22c2f 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) |