aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-12 10:28:42 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-16 06:40:14 -0500
commit84dab5671bff4516781c14f4fba5a1e2be13be1e (patch)
treea2b8b51e9067141fb8617d8f6a49f440e3a52df9 /sound/soc/soc-dapm.c
parentce0df3d79a1b305cb39ea15a07235b5a6c3435b6 (diff)
ASoC: Use DAPM context rather than CODEC when constructing sequences
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@opensource.wolfsonmicro.com> Acked-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 60c8dec49480..02b6ac46b278 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,
710 return sort[a->id] - sort[b->id]; 710 return sort[a->id] - sort[b->id];
711 if (a->reg != b->reg) 711 if (a->reg != b->reg)
712 return a->reg - b->reg; 712 return a->reg - b->reg;
713 if (a->codec != b->codec) 713 if (a->dapm != b->dapm)
714 return (unsigned long)a->codec - (unsigned long)b->codec; 714 return (unsigned long)a->dapm - (unsigned long)b->dapm;
715 715
716 return 0; 716 return 0;
717} 717}