mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'topic/midi20' into for-next 

Pull yet more fixes for UMP core.
All about the legacy MIDI support code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-05-25 10:33:11 +02:00
parent 0006fa2d3f 77700b81bd
commit f7241589f7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/core/ump_convert.c
View File

@ -340,9 +340,6 @@ static int cvt_legacy_cmd_to_ump(struct snd_ump_endpoint *ump,
switch (status) {
case UMP_MSG_STATUS_NOTE_ON:
if (!buf[2])
status = UMP_MSG_STATUS_NOTE_OFF;
fallthrough;
case UMP_MSG_STATUS_NOTE_OFF:
midi2->note.note = buf[1];
midi2->note.velocity = upscale_7_to_16bit(buf[2]);
@ -457,7 +454,7 @@ static int do_convert_to_ump(struct snd_ump_endpoint *ump,
}
if (c & 0x80) {
bytes = cmd_bytes[(c >> 8) & 7];
bytes = cmd_bytes[(c >> 4) & 7];
cvt->buf[0] = c;
cvt->len = 1;
cvt->cmd_bytes = bytes;