diff --git a/arch/arm64/configs/mt_connect_defconfig b/arch/arm64/configs/mt_connect_defconfig index d8d9f9f621c08..dd15ba66e2408 100644 --- a/arch/arm64/configs/mt_connect_defconfig +++ b/arch/arm64/configs/mt_connect_defconfig @@ -410,6 +410,8 @@ CONFIG_DRM=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_ALOOP=m +CONFIG_SND_SEQUENCER=y +CONFIG_SND_SEQ_MIDI=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y CONFIG_SND_SOC_FSL_ASRC=m diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 2d02f25f95979..729e154862f19 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -820,7 +820,8 @@ static int f_midi_register_card(struct f_midi *midi) strcpy(card->driver, f_midi_longname); strcpy(card->longname, f_midi_longname); - strcpy(card->shortname, f_midi_shortname); + strlcpy(card->shortname, midi->id ? midi->id : f_midi_shortname, + sizeof(card->shortname)); /* Set up rawmidi */ snd_component_add(card, "MIDI");