| From f0e431eace8106c4ff6218cbbedf3030583ba2cc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 30 Mar 2021 13:19:23 +0200 |
| Subject: ALSA: core: remove redundant spin_lock pair in snd_card_disconnect |
| |
| From: Jia Zhou <zhou.jia2@zte.com.cn> |
| |
| [ 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> |
| --- |
| sound/core/init.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/sound/core/init.c b/sound/core/init.c |
| index cc8208df26f3..29f1ed707fd1 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 */ |
| -- |
| 2.30.2 |
| |
