]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ALSA: emu10k1: don't deadlock in proc-functions
authorMichael Gernoth <michael@gernoth.net>
Thu, 9 Apr 2015 21:42:15 +0000 (23:42 +0200)
committerJiri Slaby <jslaby@suse.cz>
Mon, 4 May 2015 09:50:01 +0000 (11:50 +0200)
commit52decd9be6f9c5401cf2711be0a8bbea71dfa3cd
tree693a1c128836aad61ff2bf7b3192206646c6b24a
parentac00ee011e26da21fc84b49a87a921098c842f91
ALSA: emu10k1: don't deadlock in proc-functions

commit 91bf0c2dcb935a87e5c0795f5047456b965fd143 upstream.

The functions snd_emu10k1_proc_spdif_read and snd_emu1010_fpga_read
acquire the emu_lock before accessing the FPGA. The function used
to access the FPGA (snd_emu1010_fpga_read) also tries to take
the emu_lock which causes a deadlock.
Remove the outer locking in the proc-functions (guarding only the
already safe fpga read) to prevent this deadlock.

[removed superfluous flags variables too -- tiwai]

Signed-off-by: Michael Gernoth <michael@gernoth.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
sound/pci/emu10k1/emuproc.c