summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-01-10 13:47:45 +0300
committerMark Brown <broonie@kernel.org>2017-01-10 13:47:45 +0300
commit01c2a84c491cf1cceaf696c69870667d9563f7d0 (patch)
treea1fccb6a65818dac53f75ba52fd3064dc50765a9 /sound/soc
parenta121103c922847ba5010819a3f250f1f7fc84ab8 (diff)
parentd2e3a1358c37cd82eef92b5e908b4f0472194481 (diff)
downloadlinux-01c2a84c491cf1cceaf696c69870667d9563f7d0.tar.xz
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c10
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);
}
}
}