diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-06-28 12:44:39 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-06-28 12:44:45 +0300 |
| commit | 4926a34b1b4e568edcd47b7215718dc187147780 (patch) | |
| tree | a501d4bdb366f47aaea1928859ea3c07fbeb23c0 /sound/core | |
| parent | a64db0b9dfac2011e14e88faf59847baac1dad5a (diff) | |
| parent | 4eecae44a51a13be2d017cebc4f760173253d238 (diff) | |
| download | linux-4926a34b1b4e568edcd47b7215718dc187147780.tar.xz | |
Merge branch 'topic/midi20' into for-linus
Pull a typo fix in MIDI 2.0 helper code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/ump_convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/ump_convert.c b/sound/core/ump_convert.c index fb61df424a87..de04799fdb69 100644 --- a/sound/core/ump_convert.c +++ b/sound/core/ump_convert.c @@ -73,7 +73,7 @@ static int cvt_ump_system_to_legacy(u32 data, unsigned char *buf) case UMP_SYSTEM_STATUS_MIDI_TIME_CODE: case UMP_SYSTEM_STATUS_SONG_SELECT: buf[1] = (data >> 8) & 0x7f; - return 1; + return 2; case UMP_SYSTEM_STATUS_SONG_POSITION: buf[1] = (data >> 8) & 0x7f; buf[2] = data & 0x7f; |