Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0da0014 authored by Adrian Knoth's avatar Adrian Knoth Committed by Takashi Iwai
Browse files

ALSA: hdspm - Fix locking in snd_hdspm_midi_input_read 



For the MIDI part, we need to acquire (and release) the hmidi->lock,
access to the global hdspm structure is serialized through
hmidi->hdspm->lock instead.

Signed-off-by: default avatarAdrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 05e20542

sound/pci/rme9652/hdspm.c

+3 −1
Original line number Diff line number Diff line
@@ -1639,12 +1639,14 @@ static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi) 
		}

	}

	hmidi->pending = 0;

	spin_unlock_irqrestore(&hmidi->lock, flags);



	spin_lock_irqsave(&hmidi->hdspm->lock, flags);

	hmidi->hdspm->control_register |= hmidi->ie;

	hdspm_write(hmidi->hdspm, HDSPM_controlRegister,

		    hmidi->hdspm->control_register);

	spin_unlock_irqrestore(&hmidi->hdspm->lock, flags);



	spin_unlock_irqrestore (&hmidi->lock, flags);

	return snd_hdspm_midi_output_write (hmidi);

}