diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2019-06-07 22:07:06 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-10 15:36:45 +0100 |
| commit | 495f926c68ddb905a7a0192963096138c6a934e1 (patch) | |
| tree | c3fce116d1b18971754e83fff6853aa59734947d /sound | |
| parent | 04268bf2757a125616b6c2140e6250f43b7b737a (diff) | |
| download | linux-stable-495f926c68ddb905a7a0192963096138c6a934e1.tar.gz linux-stable-495f926c68ddb905a7a0192963096138c6a934e1.tar.bz2 linux-stable-495f926c68ddb905a7a0192963096138c6a934e1.zip | |
ASoC: core: Fix deadlock in snd_soc_instantiate_card()
Move the client_mutex lock to snd_soc_unbind_card() before
removing link components. This prevents the deadlock
in the error path in snd_soc_instantiate_card().
Fixes: 34ac3c3eb8 (ASoC: core: lock client_mutex while removing
link components)
Reported-by: kernelci.org bot <bot@kernelci.org>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3fecd957995e..41c0cfaf2db5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1008,14 +1008,12 @@ static void soc_remove_link_components(struct snd_soc_card *card, struct snd_soc_component *component; struct snd_soc_rtdcom_list *rtdcom; - mutex_lock(&client_mutex); for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component; if (component->driver->remove_order == order) soc_remove_component(component); } - mutex_unlock(&client_mutex); } static void soc_remove_dai_links(struct snd_soc_card *card) @@ -2839,12 +2837,14 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister) snd_soc_dapm_shutdown(card); snd_soc_flush_all_delayed_work(card); + mutex_lock(&client_mutex); /* remove all components used by DAI links on this card */ for_each_comp_order(order) { for_each_card_rtds(card, rtd) { soc_remove_link_components(card, rtd, order); } } + mutex_unlock(&client_mutex); soc_cleanup_card_resources(card); if (!unregister) |