diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-01-24 14:46:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-01-24 14:46:21 +0100 |
| commit | 205d6bcf9bb896903248cd8d600f23cf4d3886d2 (patch) | |
| tree | 65ec0a60aab07058a190c29d669578ee4fe60d37 /sound/core/pcm.c | |
| parent | ALSA: proc: Avoid possible leaks of snd_info_entry objects (diff) | |
| parent | ALSA: pcm: Cleanup snd_pcm_stream_lock() & co (diff) | |
| download | linux-dev-205d6bcf9bb896903248cd8d600f23cf4d3886d2.tar.xz linux-dev-205d6bcf9bb896903248cd8d600f23cf4d3886d2.zip | |
Merge branch 'topic/pcm-lock-refactor' into for-next
Pull PCM lock refactoring.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index bca0bdf3e33c..4f45b3000347 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -733,9 +733,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count) } } substream->group = &substream->self_group; - spin_lock_init(&substream->self_group.lock); - mutex_init(&substream->self_group.mutex); - INIT_LIST_HEAD(&substream->self_group.substreams); + snd_pcm_group_init(&substream->self_group); list_add_tail(&substream->link_list, &substream->self_group.substreams); atomic_set(&substream->mmap_count, 0); prev = substream; |