From: Takashi Iwai <tiwai@xxxxxxx>
commit 9a4ab167cfb1dea1df0c0c948205a62c7eb3b85b upstream.
When a device tries to update the FB name string even if its Endpoint
is declared as static, we should skip it, just already done for the FB
info update reply.
Fixes: 37e0e14128e0 ("ALSA: ump: Support UMP Endpoint and Function Block parsing")
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://patch.msgid.link/20240722135929.8612-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/core/ump.c | 7 +++++++
1 file changed, 7 insertions(+)
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -806,6 +806,13 @@ static int ump_handle_fb_name_msg(struct
if (!fb)
return -ENODEV;
+ if (ump->parsed &&
+ (ump->info.flags & SNDRV_UMP_EP_INFO_STATIC_BLOCKS)) {
+ ump_dbg(ump, "Skipping static FB name update (blk#%d)\n",
+ fb->info.block_id);
+ return 0;
+ }
+
ret = ump_append_string(ump, fb->info.name, sizeof(fb->info.name),
buf->raw, 3);
/* notify the FB name update to sequencer, too */
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-6.10/alsa-usb-audio-fix-microphone-sound-on-hd-webcam.patch
queue-6.10/alsa-firewire-lib-fix-wrong-value-as-length-of-header-for-cip_no_header-case.patch
queue-6.10/alsa-ump-don-t-update-fb-name-for-static-blocks.patch
queue-6.10/alsa-usb-audio-move-hd-webcam-quirk-to-the-right-place.patch
queue-6.10/alsa-ump-force-1-group-for-midi1-fbs.patch
queue-6.10/alsa-hda-realtek-cs35l41-fixup-remaining-asus-strix-models.patch
queue-6.10/alsa-usb-audio-add-a-quirk-for-sonix-hd-usb-camera.patch
