diff options
| author | Michael Gernoth <michael@gernoth.net> | 2015-04-10 00:42:15 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-09-18 04:20:28 +0300 |
| commit | 4ba8f6690e4527d237f05f9f0e949add2742a796 (patch) | |
| tree | 97f8d94e5b2dd8fcf2b0aa3330d362ae4ac80f4c /sound/sound_core.c | |
| parent | 0752fa6ecb51ee1f546c9386d937d0d26884b7b4 (diff) | |
| download | linux-4ba8f6690e4527d237f05f9f0e949add2742a796.tar.xz | |
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: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'sound/sound_core.c')
0 files changed, 0 insertions, 0 deletions