aboutsummaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorGravatar Takashi Iwai <tiwai@suse.de> 2024-04-28 12:00:57 +0200
committerGravatar Takashi Iwai <tiwai@suse.de> 2024-04-28 12:00:57 +0200
commit6b844f0626fca6acec83521081aaa82cdf9add6b (patch)
treed7bbb439bfbd80d46c57a3d9962c695b4cc7bb33 /sound/core
parentALSA: kunit: use const qualifier for immutable data (diff)
parentALSA: emu10k1: move code for entering E-MU card FPGA programming mode (diff)
downloadlinux-6b844f0626fca6acec83521081aaa82cdf9add6b.tar.gz
linux-6b844f0626fca6acec83521081aaa82cdf9add6b.tar.bz2
linux-6b844f0626fca6acec83521081aaa82cdf9add6b.zip
Merge branch 'topic/emu10k1-fix' into for-next
Pull emu10k1 fixes from Oswald Buddenhagen Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/seq/seq_ump_convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_ump_convert.c b/sound/core/seq/seq_ump_convert.c
index b141024830ec..ee6ac649df83 100644
--- a/sound/core/seq/seq_ump_convert.c
+++ b/sound/core/seq/seq_ump_convert.c
@@ -428,7 +428,7 @@ static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest,
midi1->note.group = midi2->note.group;
midi1->note.status = midi2->note.status;
midi1->note.channel = midi2->note.channel;
- switch (midi2->note.status << 4) {
+ switch (midi2->note.status) {
case UMP_MSG_STATUS_NOTE_ON:
case UMP_MSG_STATUS_NOTE_OFF:
midi1->note.note = midi2->note.note;