hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/sound/synth/emux/emux.c
....@@ -1,21 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Copyright (C) 2000 Takashi Iwai <tiwai@suse.de>
34 *
45 * Routines for control of EMU WaveTable chip
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
196 */
207
218 #include <linux/wait.h>
....@@ -138,15 +125,10 @@
138125 */
139126 int snd_emux_free(struct snd_emux *emu)
140127 {
141
- unsigned long flags;
142
-
143128 if (! emu)
144129 return -EINVAL;
145130
146
- spin_lock_irqsave(&emu->voice_lock, flags);
147
- if (emu->timer_active)
148
- del_timer(&emu->tlist);
149
- spin_unlock_irqrestore(&emu->voice_lock, flags);
131
+ del_timer_sync(&emu->tlist);
150132
151133 snd_emux_proc_free(emu);
152134 snd_emux_delete_virmidi(emu);