diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 11:47:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 11:47:45 +0100 |
| commit | 01c2a84c491cf1cceaf696c69870667d9563f7d0 (patch) | |
| tree | a1fccb6a65818dac53f75ba52fd3064dc50765a9 /sound | |
| parent | Linux 4.10-rc3 (diff) | |
| parent | ASoC: Fix binding and probing of auxiliary components (diff) | |
| download | linux-01c2a84c491cf1cceaf696c69870667d9563f7d0.tar.xz linux-01c2a84c491cf1cceaf696c69870667d9563f7d0.zip | |
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f1901bb1466e..baa1afa41e3d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1748,6 +1748,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) component->init = aux_dev->init; component->auxiliary = 1; + list_add(&component->card_aux_list, &card->aux_comp_list); return 0; @@ -1758,16 +1759,14 @@ err_defer: static int soc_probe_aux_devices(struct snd_soc_card *card) { - struct snd_soc_component *comp; + struct snd_soc_component *comp, *tmp; int order; int ret; for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(comp, &card->component_dev_list, card_list) { - if (!comp->auxiliary) - continue; - + list_for_each_entry_safe(comp, tmp, &card->aux_comp_list, + card_aux_list) { if (comp->driver->probe_order == order) { ret = soc_probe_component(card, comp); if (ret < 0) { @@ -1776,6 +1775,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) comp->name, ret); return ret; } + list_del(&comp->card_aux_list); } } } |