Commit 9ea5ca75 authored by Jiri Slaby's avatar Jiri Slaby Committed by Takashi Iwai
Browse files

sound: OSS: mpu401, fix deadlock 



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

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 580c9d37

sound/oss/mpu401.c

+3 −13
Original line number Diff line number Diff line
@@ -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)

{

	int tmp;

	unsigned long flags;



	devc->version = devc->revision = 0;



	spin_lock_irqsave(&devc->lock,flags);

	if ((tmp = mpu_cmd(n, 0xAC, 0)) < 0)

	{

		spin_unlock_irqrestore(&devc->lock,flags);

	tmp = mpu_cmd(n, 0xAC, 0);

	if (tmp < 0)

		return;

	}

	if ((tmp & 0xf0) > 0x20)	/* Why it's larger than 2.x ??? */

	{

		spin_unlock_irqrestore(&devc->lock,flags);

		return;

	}

	devc->version = tmp;



	if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0)

	{

	if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0) {

		devc->version = 0;

		spin_unlock_irqrestore(&devc->lock,flags);

		return;

	}

	devc->revision = tmp;

	spin_unlock_irqrestore(&devc->lock,flags);

}



int attach_mpu401(struct address_info *hw_config, struct module *owner)