diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-12 16:28:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-16 12:40:14 +0100 |
| commit | 84dab5671bff4516781c14f4fba5a1e2be13be1e (patch) | |
| tree | a2b8b51e9067141fb8617d8f6a49f440e3a52df9 /sound/soc | |
| parent | ASoC: Fix incorrect kfree in wm8962_probe error path (diff) | |
| download | linux-84dab5671bff4516781c14f4fba5a1e2be13be1e.tar.xz linux-84dab5671bff4516781c14f4fba5a1e2be13be1e.zip | |
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 '')
| -rw-r--r-- | sound/soc/soc-dapm.c | 4 |
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, 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; + if (a->dapm != b->dapm) + return (unsigned long)a->dapm - (unsigned long)b->dapm; return 0; } |