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

Commit 6423f9ea authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

sound: seq_midi_event: fix decoding of (N)RPN events 



When decoding (N)RPN sequencer events into raw MIDI commands, the
extra_decode_xrpn() function had accidentally swapped the MSB and LSB
controller values of both the parameter number and the data value.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 07a2039b

sound/core/seq/seq_midi_event.c

+4 −4
Original line number Diff line number Diff line
@@ -504,10 +504,10 @@ static int extra_decode_xrpn(struct snd_midi_event *dev, unsigned char *buf, 
	if (dev->nostat && count < 12)

		return -ENOMEM;

	cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f);

	bytes[0] = ev->data.control.param & 0x007f;

	bytes[1] = (ev->data.control.param & 0x3f80) >> 7;

	bytes[2] = ev->data.control.value & 0x007f;

	bytes[3] = (ev->data.control.value & 0x3f80) >> 7;

	bytes[0] = (ev->data.control.param & 0x3f80) >> 7;

	bytes[1] = ev->data.control.param & 0x007f;

	bytes[2] = (ev->data.control.value & 0x3f80) >> 7;

	bytes[3] = ev->data.control.value & 0x007f;

	if (cmd != dev->lastcmd && !dev->nostat) {

		if (count < 9)

			return -ENOMEM;