Commit 82937056 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

usb: gadget: midi2: Fix interpretation of is_midi1 bits 



The UMP Function Block info m1.0 field (represented by is_midi1 sysfs
entry) is an enumeration from 0 to 2, while the midi2 gadget driver
incorrectly copies it to the corresponding snd_ump_block_info.flags
bits as-is.  This made the wrong bit flags set when m1.0 = 2.

This patch corrects the wrong interpretation of is_midi1 bits.

Fixes: 29ee7a4d ("usb: gadget: midi2: Add configfs support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20241127070213.8232-1-tiwai@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4faee01

drivers/usb/gadget/function/f_midi2.c

+5 −1
Original line number Diff line number Diff line
@@ -1591,7 +1591,11 @@ static int f_midi2_create_card(struct f_midi2 *midi2) 
			fb->info.midi_ci_version = b->midi_ci_version;

			fb->info.ui_hint = reverse_dir(b->ui_hint);

			fb->info.sysex8_streams = b->sysex8_streams;

			if (b->is_midi1 < 2)

				fb->info.flags |= b->is_midi1;

			else

				fb->info.flags |= SNDRV_UMP_BLOCK_IS_MIDI1 |

					SNDRV_UMP_BLOCK_IS_LOWSPEED;

			strscpy(fb->info.name, ump_fb_name(b),

				sizeof(fb->info.name));

		}