diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-05-25 10:33:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-05-25 10:33:17 +0200 |
| commit | f7241589f7bcc6783d416ab1dd7832d4b2a2aa72 (patch) | |
| tree | ba3fe67469c8f986915ceab872f39eb8aa749a37 | |
| parent | 0006fa2d3fa0320a385bd19c9c98b70ad3db7197 (diff) | |
| parent | 77700b81bd0e47d89d50eb4b3f2f323492f79998 (diff) | |
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>
| -rw-r--r-- | sound/core/ump_convert.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/core/ump_convert.c b/sound/core/ump_convert.c index cb7c2f959a27..48ab3e1bd62e 100644 --- a/sound/core/ump_convert.c +++ b/sound/core/ump_convert.c @@ -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; |