mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
This commit is contained in:
commit
01c2a84c49
2 changed files with 8 additions and 5 deletions
|
@ -813,6 +813,7 @@ struct snd_soc_component {
|
|||
unsigned int suspended:1; /* is in suspend PM state */
|
||||
|
||||
struct list_head list;
|
||||
struct list_head card_aux_list; /* for auxiliary bound components */
|
||||
struct list_head card_list;
|
||||
|
||||
struct snd_soc_dai_driver *dai_drv;
|
||||
|
@ -1152,6 +1153,7 @@ struct snd_soc_card {
|
|||
*/
|
||||
struct snd_soc_aux_dev *aux_dev;
|
||||
int num_aux_devs;
|
||||
struct list_head aux_comp_list;
|
||||
|
||||
const struct snd_kcontrol_new *controls;
|
||||
int num_controls;
|
||||
|
@ -1547,6 +1549,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
|
|||
INIT_LIST_HEAD(&card->widgets);
|
||||
INIT_LIST_HEAD(&card->paths);
|
||||
INIT_LIST_HEAD(&card->dapm_list);
|
||||
INIT_LIST_HEAD(&card->aux_comp_list);
|
||||
INIT_LIST_HEAD(&card->component_dev_list);
|
||||
}
|
||||
|
||||
|
|
|
@ -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 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
|
|||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue