ALSA: emu10k1: don't deadlock in proc-functions
authorMichael Gernoth <michael@gernoth.net>
Thu, 9 Apr 2015 21:42:15 +0000 (23:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 10 Apr 2015 11:02:23 +0000 (13:02 +0200)
commit91bf0c2dcb935a87e5c0795f5047456b965fd143
treeec91242a6c5756eb131a9cd6ecc4252a4b8185b8
parent3dc8523fa7412e731441c01fb33f003eb3cfece1
ALSA: emu10k1: don't deadlock in proc-functions

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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/emu10k1/emuproc.c