summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-07-22 17:06:06 +0300
committerTakashi Iwai <tiwai@suse.de>2024-07-22 17:17:51 +0300
commitac29d8ae05b770ed3f52d7a60908ab9b126f69d7 (patch)
treef3224953c7d71b8ce3937b5b741a4f7c1df6db04 /sound
parent9a4ab167cfb1dea1df0c0c948205a62c7eb3b85b (diff)
downloadlinux-ac29d8ae05b770ed3f52d7a60908ab9b126f69d7.tar.xz
ALSA: ump: Force 1 Group for MIDI1 FBs
When a Function Block declares it being a legacy MIDI1 device, it has to be only with a single UMP Group. Correct the attribute when a device declares it wrongly. Fixes: 37e0e14128e0 ("ALSA: ump: Support UMP Endpoint and Function Block parsing") Cc: <stable@vger.kernel.org> Link: https://patch.msgid.link/20240722140610.10845-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/ump.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/core/ump.c b/sound/core/ump.c
index b325fcfa77d0..0f0d7e895c5a 100644
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -733,6 +733,12 @@ static void fill_fb_info(struct snd_ump_endpoint *ump,
info->block_id, info->direction, info->active,
info->first_group, info->num_groups, info->midi_ci_version,
info->sysex8_streams, info->flags);
+
+ if ((info->flags & SNDRV_UMP_BLOCK_IS_MIDI1) && info->num_groups != 1) {
+ info->num_groups = 1;
+ ump_dbg(ump, "FB %d: corrected groups to 1 for MIDI1\n",
+ info->block_id);
+ }
}
/* check whether the FB info gets updated by the current message */