summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2023-07-05 12:50:51 +0300
committerTakashi Iwai <tiwai@suse.de>2023-07-05 12:50:56 +0300
commit5284876d82da4453df0e21f1d243b026281a6558 (patch)
tree1f7e8bac7d6a4bb79460293780d8081fc18aa909 /sound/core
parent72cea3a3175b50a4875b3c112fb13df20c6218a5 (diff)
parent983b9180db96255183c30f69fe43c0db75bf8502 (diff)
downloadlinux-5284876d82da4453df0e21f1d243b026281a6558.tar.xz
Merge branch 'topic/midi20' into for-linus
Pull yet more a typo fix in the converter code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/seq/seq_ump_convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_ump_convert.c b/sound/core/seq/seq_ump_convert.c
index eb1d86ff6166..7cc84e137999 100644
--- a/sound/core/seq/seq_ump_convert.c
+++ b/sound/core/seq/seq_ump_convert.c
@@ -714,7 +714,7 @@ static int system_2p_ev_to_ump_midi1(const struct snd_seq_event *event,
{
data->system.status = status;
data->system.parm1 = (event->data.control.value >> 7) & 0x7f;
- data->system.parm1 = event->data.control.value & 0x7f;
+ data->system.parm2 = event->data.control.value & 0x7f;
return 1;
}