Skip to content

Commit 960a114

Browse files
committed
ALSA: usb-audio: Add midi2_ump_probe option
Add a new option to enable/disable the UMP Endpoint probing. Some firmware seems screwed up when such a new command issued, and this option allows user to suppress it. Link: https://lore.kernel.org/r/20230612081054.17200-5-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 54852e8 commit 960a114

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

sound/usb/midi2.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ static bool midi2_enable = true;
2727
module_param(midi2_enable, bool, 0444);
2828
MODULE_PARM_DESC(midi2_enable, "Enable MIDI 2.0 support.");
2929

30+
static bool midi2_ump_probe = true;
31+
module_param(midi2_ump_probe, bool, 0444);
32+
MODULE_PARM_DESC(midi2_ump_probe, "Probe UMP v1.1 support at first.");
33+
3034
/* stream direction; just shorter names */
3135
enum {
3236
STR_OUT = SNDRV_RAWMIDI_STREAM_OUTPUT,
@@ -1136,10 +1140,12 @@ int snd_usb_midi_v2_create(struct snd_usb_audio *chip,
11361140
goto error;
11371141
}
11381142

1139-
err = parse_ump_endpoints(umidi);
1140-
if (err < 0) {
1141-
usb_audio_err(chip, "Failed to parse UMP endpoint\n");
1142-
goto error;
1143+
if (midi2_ump_probe) {
1144+
err = parse_ump_endpoints(umidi);
1145+
if (err < 0) {
1146+
usb_audio_err(chip, "Failed to parse UMP endpoint\n");
1147+
goto error;
1148+
}
11431149
}
11441150

11451151
err = create_blocks_from_gtb(umidi);

0 commit comments

Comments
 (0)