diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:37 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:37 +0800 |
| commit | bbeadc6b01df81d4e292681c042fc2b99604714d (patch) | |
| tree | 7d7400d4e836f9ea9ff0d85c72d45eae5bddd371 /sound | |
| parent | b1d0e4ce42fff7d153cedc3e03bb5fc31dd3f9a3 (diff) | |
| parent | 9360612b8598db755c6af473e258cdf0efce2ee9 (diff) | |
Merge remote-tracking branch 'origin/audio/audmix' into audio/next
* origin/audio/audmix:
ASoC: fsl_audmix: Add spin lock to protect tdms
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_audmix.c | 5 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl_audmix.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index c7e4e9757dce..1525235a51d0 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -286,6 +286,7 @@ static int fsl_audmix_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct fsl_audmix *priv = snd_soc_dai_get_drvdata(dai); + unsigned long lock_flags; /* Capture stream shall not be handled */ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) @@ -295,12 +296,16 @@ static int fsl_audmix_dai_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + spin_lock_irqsave(&priv->lock, lock_flags); priv->tdms |= BIT(dai->driver->id); + spin_unlock_irqrestore(&priv->lock, lock_flags); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + spin_lock_irqsave(&priv->lock, lock_flags); priv->tdms &= ~BIT(dai->driver->id); + spin_unlock_irqrestore(&priv->lock, lock_flags); break; default: return -EINVAL; diff --git a/sound/soc/fsl/fsl_audmix.h b/sound/soc/fsl/fsl_audmix.h index 7812ffec45c5..479f05695d53 100644 --- a/sound/soc/fsl/fsl_audmix.h +++ b/sound/soc/fsl/fsl_audmix.h @@ -96,6 +96,7 @@ struct fsl_audmix { struct platform_device *pdev; struct regmap *regmap; struct clk *ipg_clk; + spinlock_t lock; /* Protect tdms */ u8 tdms; }; |