diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2020-09-02 16:21:16 -0500 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2020-09-03 09:24:33 +0200 |
| commit | 931522b90813a6f1c9c673ec9a0eb985b39554dc (patch) | |
| tree | fe2ef5ba513653532487f3454fe8dba6398033fc /sound/core/pcm.c | |
| parent | ALSA: hda/ca0132 - Add AE-7 exit commands. (diff) | |
| download | linux-dev-931522b90813a6f1c9c673ec9a0eb985b39554dc.tar.xz linux-dev-931522b90813a6f1c9c673ec9a0eb985b39554dc.zip | |
ALSA: core: pcm: simplify locking for timers
Fix sparse warning:
sound/core/pcm.c:999:9: warning: context imbalance in
'snd_pcm_detach_substream' - different lock contexts for basic block
There's no real reason to test the same thing twice, and it's simpler
have linear sequences.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200902212133.30964-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index b6d2331a82f7..be5714f1bb58 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -991,11 +991,13 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream) PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control))); kfree(runtime->hw_constraints.rules); /* Avoid concurrent access to runtime via PCM timer interface */ - if (substream->timer) + if (substream->timer) { spin_lock_irq(&substream->timer->lock); - substream->runtime = NULL; - if (substream->timer) + substream->runtime = NULL; spin_unlock_irq(&substream->timer->lock); + } else { + substream->runtime = NULL; + } kfree(runtime); put_pid(substream->pid); substream->pid = NULL; |