aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJia Zhou <zhou.jia2@zte.com.cn>2021-03-30 13:19:23 +0200
committerTakashi Iwai <tiwai@suse.de>2021-03-30 13:50:15 +0200
commitabc21649b3e5c34b143bf86f0c78e33d5815e250 (patch)
tree8a4cd536ebe8d0f62b807dec7d6c51a27f07e77a
parentALSA: pcm: Fix couple of typos (diff)
downloadlinux-dev-abc21649b3e5c34b143bf86f0c78e33d5815e250.tar.xz
linux-dev-abc21649b3e5c34b143bf86f0c78e33d5815e250.zip
ALSA: core: remove redundant spin_lock pair in snd_card_disconnect
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>
-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 45f4b01de23f..ef41f5b3a240 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -398,10 +398,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 */