summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorJia Zhou <zhou.jia2@zte.com.cn>2021-03-30 14:19:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-14 10:50:31 +0300
commit897c095c7e9ea3c20875f7d6ff626f8455d3324e (patch)
treef7a8d6f92b0729011058ebb56d10902682ad3d32 /sound/core
parentafb3416c4fef5c4e18808c9328e01967b2a2a501 (diff)
downloadlinux-897c095c7e9ea3c20875f7d6ff626f8455d3324e.tar.xz
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 018ce4ef12ec..9f5270c90a10 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -390,10 +390,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 */