diff options
| author | Michael Gernoth <michael@gernoth.net> | 2015-04-09 23:42:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 21:59:14 +0200 |
| commit | 7a20b231f2a0b173b7ff505c85557c3d0a8f7a0d (patch) | |
| tree | 358f266bb03ecedd7a82df76410e4747f71ca4c7 /sound/sound_firmware.c | |
| parent | baf6b42332e11b3cbc8b2edd11dc0c6c7136f997 (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/sound_firmware.c')
0 files changed, 0 insertions, 0 deletions