@@ -1268,7 +1268,6 @@ static int soc_probe_component(struct snd_soc_card *card,
component->card = card;
dapm->card = card;
- INIT_LIST_HEAD(&component->card_list);
INIT_LIST_HEAD(&dapm->list);
soc_set_name_prefix(card, component);
@@ -2644,6 +2643,8 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
struct snd_soc_dapm_context *dapm;
INIT_LIST_HEAD(&component->dai_list);
+ INIT_LIST_HEAD(&component->dobj_list);
+ INIT_LIST_HEAD(&component->card_list);
mutex_init(&component->io_mutex);
component->name = fmt_single_name(dev, &component->id);
@@ -2729,7 +2730,6 @@ static void snd_soc_component_add(struct snd_soc_component *component)
/* see for_each_component */
list_add(&component->list, &component_list);
- INIT_LIST_HEAD(&component->dobj_list);
mutex_unlock(&client_mutex);
}