From: Jia Zhou Date: Tue, 30 Mar 2021 11:19:23 +0000 (+0200) Subject: ALSA: core: remove redundant spin_lock pair in snd_card_disconnect X-Git-Tag: v5.11.21~176 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40296b5e42aae36296b9dfd288ce3ed44296983d;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Yi Wang Link: https://lore.kernel.org/r/1616989007-34429-1-git-send-email-wang.yi59@zte.com.cn Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- diff --git a/sound/core/init.c b/sound/core/init.c index cc8208df26f39..29f1ed707fd10 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -388,10 +388,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 */