Message ID | 20200402185359.3424-1-hdegoede@redhat.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 81630dc042af998b9f58cd8e2c29dab9777ea176 |
Headers | show |
Series | [1/3] ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() | expand |
On 4/2/20 1:53 PM, Hans de Goede wrote: > 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> 2014 bug, nice! for the series: Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/intel/atom/sst-atom-controls.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c > index baef461a99f1..2c3798034b1d 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); >
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index baef461a99f1..2c3798034b1d 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);
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> --- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+)