This is a note to let you know that I've just added the patch titled
ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-seq-ump-fix-conversion-from-midi2-to-midi1-ump-messages.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f25f17dc5c6a5e3f2014d44635f0c0db45224efe Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri, 19 Apr 2024 12:04:39 +0200
Subject: ALSA: seq: ump: Fix conversion from MIDI2 to MIDI1 UMP messages
From: Takashi Iwai <tiwai@xxxxxxx>
commit f25f17dc5c6a5e3f2014d44635f0c0db45224efe upstream.
The conversion from MIDI2 to MIDI1 UMP messages had a leftover
artifact (superfluous bit shift), and this resulted in the bogus type
check, leading to empty outputs. Let's fix it.
Fixes: e9e02819a98a ("ALSA: seq: Automatic conversion of UMP events")
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://github.com/alsa-project/alsa-utils/issues/262
Message-ID: <20240419100442.14806-1-tiwai@xxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/core/seq/seq_ump_convert.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/core/seq/seq_ump_convert.c b/sound/core/seq/seq_ump_convert.c
index b141024830ec..ee6ac649df83 100644
--- a/sound/core/seq/seq_ump_convert.c
+++ b/sound/core/seq/seq_ump_convert.c
@@ -428,7 +428,7 @@ static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest,
midi1->note.group = midi2->note.group;
midi1->note.status = midi2->note.status;
midi1->note.channel = midi2->note.channel;
- switch (midi2->note.status << 4) {
+ switch (midi2->note.status) {
case UMP_MSG_STATUS_NOTE_ON:
case UMP_MSG_STATUS_NOTE_OFF:
midi1->note.note = midi2->note.note;
--
2.44.0
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-6.6/alsa-scarlett2-default-mixer-driver-to-enabled.patch
queue-6.6/alsa-scarlett2-add-correct-product-series-name-to-me.patch
queue-6.6/alsa-hda-tas2781-correct-the-register-for-pow-calibrated-data.patch
queue-6.6/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch
queue-6.6/alsa-scarlett2-rename-scarlett_gen2-to-scarlett2.patch
queue-6.6/alsa-scarlett2-add-focusrite-clarett-2pre-and-4pre-s.patch
queue-6.6/alsa-scarlett2-add-focusrite-clarett-2pre-and-4pre-u.patch
queue-6.6/alsa-hda-realtek-add-quirks-for-huawei-matebook-d14-nblb-wax9n.patch
queue-6.6/alsa-hda-realtek-enable-audio-jacks-of-haier-boyue-g42-with-alc269vc.patch
queue-6.6/alsa-hda-tas2781-add-new-vendor_id-and-subsystem_id-to-support-thinkpad-ice-1.patch
queue-6.6/alsa-seq-ump-fix-conversion-from-midi2-to-midi1-ump-messages.patch
queue-6.6/alsa-scarlett2-add-support-for-clarett-8pre-usb.patch
