Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: usb-audio: Update UMP group attributes for GTB blocks, too

Browse Source 
When a FB is created from a GTB instead of UMP FB Info inquiry, we
missed the update of the corresponding UMP Group attributes.
Export the call of updater and let it be called from the USB driver.

Fixes: 0642a3c5ca ("ALSA: ump: Update substream name from assigned FB names")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807092303.1935-5-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2024-08-07 11:22:59 +02:00
parent ac3a9185bd
commit ebaa86c0bd
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/ump.h
View File

@ -123,6 +123,7 @@ static inline int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,
int snd_ump_receive_ump_val(struct snd_ump_endpoint *ump, u32 val); int snd_ump_receive_ump_val(struct snd_ump_endpoint *ump, u32 val);
int snd_ump_switch_protocol(struct snd_ump_endpoint *ump, unsigned int protocol); int snd_ump_switch_protocol(struct snd_ump_endpoint *ump, unsigned int protocol);
void snd_ump_update_group_attrs(struct snd_ump_endpoint *ump);
/* /*
* Some definitions for UMP * Some definitions for UMP

9
sound/core/ump.c
View File

@ -525,7 +525,7 @@ static void snd_ump_proc_read(struct snd_info_entry *entry,
} }
/* update dir_bits and active flag for all groups in the client */ /* update dir_bits and active flag for all groups in the client */
static void update_group_attrs(struct snd_ump_endpoint *ump) void snd_ump_update_group_attrs(struct snd_ump_endpoint *ump)
{ {
struct snd_ump_block *fb; struct snd_ump_block *fb;
struct snd_ump_group *group; struct snd_ump_group *group;
@ -578,6 +578,7 @@ static void update_group_attrs(struct snd_ump_endpoint *ump)
} }
} }
} }
EXPORT_SYMBOL_GPL(snd_ump_update_group_attrs);
/* /*
* UMP endpoint and function block handling * UMP endpoint and function block handling
@ -863,7 +864,7 @@ static int ump_handle_fb_info_msg(struct snd_ump_endpoint *ump,
if (fb) { if (fb) {
fill_fb_info(ump, &fb->info, buf); fill_fb_info(ump, &fb->info, buf);
if (ump->parsed) { if (ump->parsed) {
update_group_attrs(ump); snd_ump_update_group_attrs(ump);
seq_notify_fb_change(ump, fb); seq_notify_fb_change(ump, fb);
} }
} }
@ -895,7 +896,7 @@ static int ump_handle_fb_name_msg(struct snd_ump_endpoint *ump,
buf->raw, 3); buf->raw, 3);
/* notify the FB name update to sequencer, too */ /* notify the FB name update to sequencer, too */
if (ret > 0 && ump->parsed) { if (ret > 0 && ump->parsed) {
update_group_attrs(ump); snd_ump_update_group_attrs(ump);
seq_notify_fb_change(ump, fb); seq_notify_fb_change(ump, fb);
} }
return ret; return ret;
@ -1065,7 +1066,7 @@ int snd_ump_parse_endpoint(struct snd_ump_endpoint *ump)
} }
/* initialize group attributions */ /* initialize group attributions */
update_group_attrs(ump); snd_ump_update_group_attrs(ump);
error: error:
ump->parsed = true; ump->parsed = true;

2
sound/usb/midi2.c
View File

@ -877,6 +877,8 @@ static int create_gtb_block(struct snd_usb_midi2_ump *rmidi, int dir, int blk)
} }
} }
snd_ump_update_group_attrs(rmidi->ump);
usb_audio_dbg(umidi->chip, usb_audio_dbg(umidi->chip,
"Created a UMP block %d from GTB, name=%s, flags=0x%x\n", "Created a UMP block %d from GTB, name=%s, flags=0x%x\n",
blk, fb->info.name, fb->info.flags); blk, fb->info.name, fb->info.flags);