Skip to content

Commit 127e8c9

Browse files
tiwaipelwell
authored andcommitted
ALSA: seq: ump: Fix swapped song position pointer data
[ Upstream commit 310fa3e ] 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: e9e0281 ("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>
1 parent 5540233 commit 127e8c9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sound/core/seq/seq_ump_convert.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static void ump_system_to_one_param_ev(const union snd_ump_midi1_msg *val,
157157
static void ump_system_to_songpos_ev(const union snd_ump_midi1_msg *val,
158158
struct snd_seq_event *ev)
159159
{
160-
ev->data.control.value = (val->system.parm1 << 7) | val->system.parm2;
160+
ev->data.control.value = (val->system.parm2 << 7) | val->system.parm1;
161161
}
162162

163163
/* Encoders for 0xf0 - 0xff */
@@ -752,8 +752,8 @@ static int system_2p_ev_to_ump_midi1(const struct snd_seq_event *event,
752752
unsigned char status)
753753
{
754754
data->system.status = status;
755-
data->system.parm1 = (event->data.control.value >> 7) & 0x7f;
756-
data->system.parm2 = event->data.control.value & 0x7f;
755+
data->system.parm1 = event->data.control.value & 0x7f;
756+
data->system.parm2 = (event->data.control.value >> 7) & 0x7f;
757757
return 1;
758758
}
759759

0 commit comments

Comments
 (0)