Commit 51701400 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Trim superfluous "MIDI" suffix from UMP EP name 



A single USB audio device may have multiple interfaces for different
purposes (e.g. audio, MIDI and HID), where the iInterface descriptor
of each interface may contain an own suffix, e.g. "MIDI" for a MIDI
interface.  as such a suffix is superfluous as a rawmidi and UMP
Endpoint name, this patch trims the superfluous "MIDI" suffix from the
name string.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230523075358.9672-12-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 06cf3bf0

sound/usb/midi2.c

+7 −0
Original line number Diff line number Diff line
@@ -896,7 +896,14 @@ static int set_altset(struct snd_usb_midi2_interface *umidi) 
static void fill_ump_ep_name(struct snd_ump_endpoint *ump,

			     struct usb_device *dev, int id)

{

	int len;



	usb_string(dev, id, ump->info.name, sizeof(ump->info.name));



	/* trim superfluous "MIDI" suffix */

	len = strlen(ump->info.name);

	if (len > 5 && !strcmp(ump->info.name + len - 5, " MIDI"))

		ump->info.name[len - 5] = 0;

}



/* fill the fallback name string for each rawmidi instance */