From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 22 Jul 2024 13:59:28 +0000 (+0200)
Subject: ALSA: ump: Don't update FB name for static blocks
X-Git-Tag: v6.11-rc1~32^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a4ab167cfb1dea1df0c0c948205a62c7eb3b85b;p=thirdparty%2Flinux.git

ALSA: ump: Don't update FB name for static blocks

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@vger.kernel.org>
Link: https://patch.msgid.link/20240722135929.8612-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/core/ump.c b/sound/core/ump.c
index 3f61220c23b4e..b325fcfa77d06 100644
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -806,6 +806,13 @@ static int ump_handle_fb_name_msg(struct snd_ump_endpoint *ump,
 	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 */