Commit 4926a34b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/midi20' into for-linus 



Pull a typo fix in MIDI 2.0 helper code.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents a64db0b9 4eecae44

sound/core/ump_convert.c

+1 −1
Original line number Diff line number Diff line
@@ -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;