summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-11-11 18:36:42 +0100
committerTakashi Iwai <tiwai@suse.de>2019-11-11 18:37:06 +0100
commit0c4f09ceec3d7afbef6ad4077d96e36e0fad4028 (patch)
tree56cbb236120a749c6533cb735f4caa3a7852bb69 /sound/core
parent2bc1e1fdd0fc54ef6aee14c7710af21ce816b398 (diff)
ALSA: timer: Fix the breakage of slave link open
A silly mistake was made while applying the fix for potential races in commit 6a34367e52ca ("ALSA: timer: Fix possible race at assigning a timer instance"): when a slave PCM is opened and succeeds, it doesn't return but proceeds to the master timer open code instead. Plug the hole and beautify a bit. Fixes: 6a34367e52ca ("ALSA: timer: Fix possible race at assigning a timer instance") Reported-by: syzbot+4476917c053f60112c99@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/20191111173642.6093-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 9091030f4a89..24fed5c78273 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -268,8 +268,7 @@ int snd_timer_open(struct snd_timer_instance *timeri,
list_add_tail(&timeri->open_list, &snd_timer_slave_list);
num_slaves++;
err = snd_timer_check_slave(timeri);
- if (err < 0)
- goto close;
+ goto list_added;
}
/* open a master instance */
@@ -324,7 +323,7 @@ int snd_timer_open(struct snd_timer_instance *timeri,
list_add_tail(&timeri->open_list, &timer->open_list_head);
timer->num_instances++;
err = snd_timer_check_master(timeri);
- close:
+list_added:
if (err < 0)
snd_timer_close_locked(timeri, &card_dev_to_put);