ASoC: dapm: Fix locking during codec shutdown
Codec shutdown performs a DAPM power sequence that might cause conflicts and/or race conditions if another stream power event is running simultaneously. Use card's dapm mutex to protect any potential race condition between them. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com> Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
This commit is contained in:
parent
32fee7afe7
commit
01005a729a
|
@ -3537,10 +3537,13 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_free);
|
||||||
|
|
||||||
static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
|
static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
|
||||||
{
|
{
|
||||||
|
struct snd_soc_card *card = dapm->card;
|
||||||
struct snd_soc_dapm_widget *w;
|
struct snd_soc_dapm_widget *w;
|
||||||
LIST_HEAD(down_list);
|
LIST_HEAD(down_list);
|
||||||
int powerdown = 0;
|
int powerdown = 0;
|
||||||
|
|
||||||
|
mutex_lock(&card->dapm_mutex);
|
||||||
|
|
||||||
list_for_each_entry(w, &dapm->card->widgets, list) {
|
list_for_each_entry(w, &dapm->card->widgets, list) {
|
||||||
if (w->dapm != dapm)
|
if (w->dapm != dapm)
|
||||||
continue;
|
continue;
|
||||||
|
@ -3563,6 +3566,8 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
|
||||||
snd_soc_dapm_set_bias_level(dapm,
|
snd_soc_dapm_set_bias_level(dapm,
|
||||||
SND_SOC_BIAS_STANDBY);
|
SND_SOC_BIAS_STANDBY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex_unlock(&card->dapm_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue