diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2019-05-23 19:12:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-24 14:10:46 +0200 |
| commit | 34ac3c3eb8f0c07252ceddf0a22dd240e5c91ccb (patch) | |
| tree | f850e4fb8ecf9fd7652c67c1ac06eacf567c98b9 | |
| parent | ASoC: simple-card: Restore original configuration of DAI format (diff) | |
| download | linux-34ac3c3eb8f0c07252ceddf0a22dd240e5c91ccb.tar.xz linux-34ac3c3eb8f0c07252ceddf0a22dd240e5c91ccb.zip | |
ASoC: core: lock client_mutex while removing link components
Removing link components results in topology unloading. So,
acquire the client_mutex before removing components in
soc_remove_link_components. This will prevent the lockdep warning
seen when dai links are removed during topology removal.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2403bec2fccf..7c9415987ac7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1005,12 +1005,14 @@ 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) |