diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-02-01 16:52:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-02-01 16:52:54 +0100 |
| commit | 52517d9c0c011272950e1d88f1ced297daa001e9 (patch) | |
| tree | a6a17b07901b39d9caddf45a8972207512e6a8ed /sound/core | |
| parent | 1c7f0e349aa5f8f80b1cac3d4917405332e14cdf (diff) | |
| parent | a4f399a1416f645ac701064a55b0cb5203707ac9 (diff) | |
Merge tag 'asoc-fix-v5.17-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.17
Quite a few fixes here, including an unusually large set in the core
spurred on by various testing efforts as well as the usual small driver
fixes. There are quite a few fixes for out of bounds writes in both the
core and the various Qualcomm drivers, plus a couple of fixes for
locking in the DPCM code.
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 621883e71194..a056b3ef3c84 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -172,6 +172,19 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream) } EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave); +unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream) +{ + unsigned long flags = 0; + if (substream->pcm->nonatomic) + mutex_lock_nested(&substream->self_group.mutex, + SINGLE_DEPTH_NESTING); + else + spin_lock_irqsave_nested(&substream->self_group.lock, flags, + SINGLE_DEPTH_NESTING); + return flags; +} +EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave_nested); + /** * snd_pcm_stream_unlock_irqrestore - Unlock the PCM stream * @substream: PCM substream |