summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2020-04-02 20:53:57 +0200
committerMark Brown <broonie@kernel.org>2020-04-03 14:39:57 +0100
commit81630dc042af998b9f58cd8e2c29dab9777ea176 (patch)
tree457a192fe44da028c8c56a8ce6ee23a80d76c3eb /sound/soc
parent904f353d0e508fb4b3a3f902a02b0a028cda33a6 (diff)
ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
sst_send_slot_map() uses sst_fill_and_send_cmd_unlocked() because in some places it is called with the drv->lock mutex already held. So it must always be called with the mutex locked. This commit adds missing locking in the sst_set_be_modules() code-path. Fixes: 24c8d14192cc ("ASoC: Intel: mrfld: add DSP core controls") Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200402185359.3424-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/atom/sst-atom-controls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index f883c9340eee..df8f7994d3b7 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -966,7 +966,9 @@ static int sst_set_be_modules(struct snd_soc_dapm_widget *w,
dev_dbg(c->dev, "Enter: widget=%s\n", w->name);
if (SND_SOC_DAPM_EVENT_ON(event)) {
+ mutex_lock(&drv->lock);
ret = sst_send_slot_map(drv);
+ mutex_unlock(&drv->lock);
if (ret)
return ret;
ret = sst_send_pipe_module_params(w, k);