summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-22 17:03:56 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-22 17:03:56 +0200
commit3f67f6693c82f1cb8edb233f9bd10fa06d27a193 (patch)
treed1d5d1241f1675438026b180049fe6ff3c0ddc24 /sound
parent12bc738596ffe4e7f566e13856a0d37ba229b539 (diff)
parent6423f9ea8035138d70bae1a278d3b57b743f8b3e (diff)
downloadlinux-3.10-3f67f6693c82f1cb8edb233f9bd10fa06d27a193.tar.gz
linux-3.10-3f67f6693c82f1cb8edb233f9bd10fa06d27a193.tar.bz2
linux-3.10-3f67f6693c82f1cb8edb233f9bd10fa06d27a193.zip
Merge branch 'topic/seq-midi-fix' into for-linus
* topic/seq-midi-fix: sound: seq_midi_event: fix decoding of (N)RPN events
Diffstat (limited to 'sound')
-rw-r--r--sound/core/seq/seq_midi_event.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c
index 8284f176a34..b5d6ea4904c 100644
--- a/sound/core/seq/seq_midi_event.c
+++ b/sound/core/seq/seq_midi_event.c
@@ -504,10 +504,10 @@ static int extra_decode_xrpn(struct snd_midi_event *dev, unsigned char *buf,
if (dev->nostat && count < 12)
return -ENOMEM;
cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f);
- bytes[0] = ev->data.control.param & 0x007f;
- bytes[1] = (ev->data.control.param & 0x3f80) >> 7;
- bytes[2] = ev->data.control.value & 0x007f;
- bytes[3] = (ev->data.control.value & 0x3f80) >> 7;
+ bytes[0] = (ev->data.control.param & 0x3f80) >> 7;
+ bytes[1] = ev->data.control.param & 0x007f;
+ bytes[2] = (ev->data.control.value & 0x3f80) >> 7;
+ bytes[3] = ev->data.control.value & 0x007f;
if (cmd != dev->lastcmd && !dev->nostat) {
if (count < 9)
return -ENOMEM;