Merge branch 'topic/seq-midi-fix' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:56 +0000 (17:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Jun 2009 15:03:56 +0000 (17:03 +0200)
* topic/seq-midi-fix:
  sound: seq_midi_event: fix decoding of (N)RPN events

sound/core/seq/seq_midi_event.c

index 8284f17..b5d6ea4 100644 (file)
@@ -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;