diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2023-01-27 14:00:28 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-27 12:14:11 +0000 |
| commit | 6bc4d1b714aafc0ee3c7649c36aa19998b4c11f9 (patch) | |
| tree | 76a8fcb50ac732333ac9d78362312a4ec8687293 /sound/soc/sof/ipc4-pcm.c | |
| parent | 32c4b69872e5fe5fd9517826be31dbf2c3dd917a (diff) | |
| download | linux-stable-6bc4d1b714aafc0ee3c7649c36aa19998b4c11f9.tar.gz linux-stable-6bc4d1b714aafc0ee3c7649c36aa19998b4c11f9.tar.bz2 linux-stable-6bc4d1b714aafc0ee3c7649c36aa19998b4c11f9.zip | |
ASoC: SOF: ipc4-topology: Protect pipeline free with mutex
When starting/stopping multiple streams in parallel, pipeline triggers
and pipeline frees can get interleaved. So use the same mutex used for
pipeline trigger to protect the pipeline frees as well. Rename the
trigger_mutex to pipeline_state_mutex for more clarity.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230127120031.10709-16-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/ipc4-pcm.c')
| -rw-r--r-- | sound/soc/sof/ipc4-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c index ababa29d6eac..2d89d3708ed0 100644 --- a/sound/soc/sof/ipc4-pcm.c +++ b/sound/soc/sof/ipc4-pcm.c @@ -222,7 +222,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, if (!trigger_list) return -ENOMEM; - mutex_lock(&ipc4_data->trigger_mutex); + mutex_lock(&ipc4_data->pipeline_state_mutex); /* * IPC4 requires pipelines to be triggered in order starting at the sink and @@ -289,7 +289,7 @@ skip_pause_transition: } free: - mutex_unlock(&ipc4_data->trigger_mutex); + mutex_unlock(&ipc4_data->pipeline_state_mutex); kfree(trigger_list); return ret; } |