diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-15 13:20:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-15 13:20:12 +0000 |
| commit | 6ccd744123679c1f19fb6e414e3df717d9ed57f6 (patch) | |
| tree | 5ab696b70ca95af60e9515f7d623c8738af1d7e1 /sound/soc/soc-dapm.c | |
| parent | 3c9e28e751cf9969c2cb2e57b5573cab86cf521a (diff) | |
| parent | bcbb243396b82b0369465e9a547b7d5278cd26ad (diff) | |
| download | blackbird-op-linux-6ccd744123679c1f19fb6e414e3df717d9ed57f6.tar.gz blackbird-op-linux-6ccd744123679c1f19fb6e414e3df717d9ed57f6.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -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 8352430f4043..bc2ec06943c0 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -706,12 +706,12 @@ 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) return a->reg - b->reg; + if (a->codec != b->codec) + return (unsigned long)a->codec - (unsigned long)b->codec; return 0; } |
