mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 06:32:50 +00:00
ASoC: Fix dapm_seq_compare() for multi-component
Ensure that we keep all widget powerups in DAPM sequence by making the CODEC the last thing we compare on rather than the first thing. Also fix the fact that we're currently comparing the widget pointers rather than the CODEC pointers when we do the substraction so we won't get stable results. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
ccb3b84fa0
commit
bcbb243396
@ -683,12 +683,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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user