summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorJia Zhou <zhou.jia2@zte.com.cn>2021-03-30 13:19:23 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:38:25 +0200
commit6682ee4724e4b3363c269adc50996768f938cedf (patch)
tree08f39f90a23df9773ac4f91c01a42a1887462f36 /sound/core
parent3f2361b3def26199a55985421807a51e0c7d1625 (diff)
ALSA: core: remove redundant spin_lock pair in snd_card_disconnect
[ Upstream commit abc21649b3e5c34b143bf86f0c78e33d5815e250 ] modification in commit 2a3f7221acdd ("ALSA: core: Fix card races between register and disconnect") resulting in this problem. Fixes: 2a3f7221acdd ("ALSA: core: Fix card races between register and disconnect") Signed-off-by: Jia Zhou <zhou.jia2@zte.com.cn> Signed-off-by: Yi Wang <wang.yi59@zte.com.cn> Link: https://lore.kernel.org/r/1616989007-34429-1-git-send-email-wang.yi59@zte.com.cn Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/init.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c
index 67765c61e5d5..d0f8405fdfd8 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -403,10 +403,8 @@ int snd_card_disconnect(struct snd_card *card)
return 0;
}
card->shutdown = 1;
- spin_unlock(&card->files_lock);
/* replace file->f_op with special dummy operations */
- spin_lock(&card->files_lock);
list_for_each_entry(mfile, &card->files_list, list) {
/* it's critical part, use endless loop */
/* we have no room to fail */