~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,22 +1,7 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* Advanced Linux Sound Architecture
3	4	* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
4		- *
5		- *
6		- * This program is free software; you can redistribute it and/or modify
7		- * it under the terms of the GNU General Public License as published by
8		- * the Free Software Foundation; either version 2 of the License, or
9		- * (at your option) any later version.
10		- *
11		- * This program is distributed in the hope that it will be useful,
12		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14		- * GNU General Public License for more details.
15		- *
16		- * You should have received a copy of the GNU General Public License
17		- * along with this program; if not, write to the Free Software
18		- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19		- *
20	5	*/
21	6
22	7	#include <linux/init.h>
..	..	@@ -177,7 +162,6 @@
177	162	mutex_unlock(&sound_oss_mutex);
178	163	return -ENOENT;
179	164	}
180		- unregister_sound_special(minor);
181	165	switch (SNDRV_MINOR_OSS_DEVICE(minor)) {
182	166	case SNDRV_MINOR_OSS_PCM:
183	167	track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_AUDIO);
..	..	@@ -189,12 +173,18 @@
189	173	track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);
190	174	break;
191	175	}
192		- if (track2 >= 0) {
193		- unregister_sound_special(track2);
	176	+ if (track2 >= 0)
194	177	snd_oss_minors[track2] = NULL;
195		- }
196	178	snd_oss_minors[minor] = NULL;
197	179	mutex_unlock(&sound_oss_mutex);
	180	+
	181	+ /* call unregister_sound_special() outside sound_oss_mutex;
	182	+ * otherwise may deadlock, as it can trigger the release of a card
	183	+ */
	184	+ unregister_sound_special(minor);
	185	+ if (track2 >= 0)
	186	+ unregister_sound_special(track2);
	187	+
198	188	kfree(mptr);
199	189	return 0;
200	190	}