iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: seq: ump: Fix swapped song position pointer data

Browse Source 
[ Upstream commit 310fa3ec2859f1c094e6e9b5d2e1ca51738c409a ]

At converting between the legacy event and UMP, the parameters for
MIDI Song Position Pointer are incorrectly stored.  It should have
been LSB -> MSB order while it stored in MSB -> LSB order.
This patch corrects the ordering.

Fixes: e9e02819a98a ("ALSA: seq: Automatic conversion of UMP events")
Link: https://lore.kernel.org/r/20240531075110.3250-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Takashi Iwai 2024-05-31 09:51:07 +02:00 committed by Greg Kroah-Hartman
parent e67cae4255
commit b7c4ef7ba3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/core/seq/seq_ump_convert.c
View File

@ -157,7 +157,7 @@ static void ump_system_to_one_param_ev(const union snd_ump_midi1_msg *val,
static void ump_system_to_songpos_ev(const union snd_ump_midi1_msg *val,
struct snd_seq_event *ev)
{
ev->data.control.value = (val->system.parm1 << 7) | val->system.parm2;
ev->data.control.value = (val->system.parm2 << 7) | val->system.parm1;
}
/* Encoders for 0xf0 - 0xff */
@ -752,8 +752,8 @@ static int system_2p_ev_to_ump_midi1(const struct snd_seq_event *event,
unsigned char status)
{
data->system.status = status;
data->system.parm1 = (event->data.control.value >> 7) & 0x7f;
data->system.parm2 = event->data.control.value & 0x7f;
data->system.parm1 = event->data.control.value & 0x7f;
data->system.parm2 = (event->data.control.value >> 7) & 0x7f;
return 1;
}