Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sound: OSS: mpu401, fix deadlock

Browse source 
mpu401_chk_version is called with a spin lock already held. Don't take it
again.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jiri Slaby 2009-06-29 18:03:34 +02:00 committed by Takashi Iwai
parent 580c9d373c
commit 9ea5ca75a2
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sound/oss/mpu401.c
View file

@ -926,31 +926,21 @@ static struct midi_operations mpu401_midi_operations[MAX_MIDI_DEV];
static void mpu401_chk_version(int n, struct mpu_config *devc) static void mpu401_chk_version(int n, struct mpu_config *devc)
{ {
int tmp; int tmp;
unsigned long flags;
devc->version = devc->revision = 0; devc->version = devc->revision = 0;
spin_lock_irqsave(&devc->lock,flags); tmp = mpu_cmd(n, 0xAC, 0);
if ((tmp = mpu_cmd(n, 0xAC, 0)) < 0) if (tmp < 0)
{
spin_unlock_irqrestore(&devc->lock,flags);
return; return;
}
if ((tmp & 0xf0) > 0x20) /* Why it's larger than 2.x ??? */ if ((tmp & 0xf0) > 0x20) /* Why it's larger than 2.x ??? */
{
spin_unlock_irqrestore(&devc->lock,flags);
return; return;
}
devc->version = tmp; devc->version = tmp;
if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0) if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0) {
{
devc->version = 0; devc->version = 0;
spin_unlock_irqrestore(&devc->lock,flags);
return; return;
} }
devc->revision = tmp; devc->revision = tmp;
spin_unlock_irqrestore(&devc->lock,flags);
} }
int attach_mpu401(struct address_info *hw_config, struct module *owner) int attach_mpu401(struct address_info *hw_config, struct module *owner)