diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 10:47:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 10:47:45 +0000 |
| commit | 01c2a84c491cf1cceaf696c69870667d9563f7d0 (patch) | |
| tree | a1fccb6a65818dac53f75ba52fd3064dc50765a9 /include/sound | |
| parent | a121103c922847ba5010819a3f250f1f7fc84ab8 (diff) | |
| parent | d2e3a1358c37cd82eef92b5e908b4f0472194481 (diff) | |
| download | linux-stable-01c2a84c491cf1cceaf696c69870667d9563f7d0.tar.gz linux-stable-01c2a84c491cf1cceaf696c69870667d9563f7d0.tar.bz2 linux-stable-01c2a84c491cf1cceaf696c69870667d9563f7d0.zip | |
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 2b502f6cc6d0..b86168a21d56 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -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); } |