summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2020-04-02 20:53:58 +0200
committerMark Brown <broonie@kernel.org>2020-04-03 15:39:57 +0200
commit0bb2be2d1b78f18ae68633b89ad49d84e0cb9bf6 (patch)
tree7b9d4c964069d529c54bd385c334b935f36c396a /sound/soc
parentASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() (diff)
downloadlinux-0bb2be2d1b78f18ae68633b89ad49d84e0cb9bf6.tar.xz
linux-0bb2be2d1b78f18ae68633b89ad49d84e0cb9bf6.zip
ASoC: Intel: atom: Check drv->lock is locked in sst_fill_and_send_cmd_unlocked
sst_fill_and_send_cmd_unlocked must be called with the drv->lock mutex locked already. In the past there have been cases where this was not the case, add a WARN_ON to check for drv->lock being locked. 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-2-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 df8f7994d3b7..69f3af4524ab 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -50,6 +50,8 @@ static int sst_fill_and_send_cmd_unlocked(struct sst_data *drv,
{
int ret = 0;
+ WARN_ON(!mutex_is_locked(&drv->lock));
+
ret = sst_fill_byte_control(drv, ipc_msg,
block, task_id, pipe_id, len, cmd_data);
if (ret < 0)