diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-22 11:03:56 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-22 11:03:56 -0400 |
| commit | 3f67f6693c82f1cb8edb233f9bd10fa06d27a193 (patch) | |
| tree | d1d5d1241f1675438026b180049fe6ff3c0ddc24 /sound | |
| parent | 12bc738596ffe4e7f566e13856a0d37ba229b539 (diff) | |
| parent | 6423f9ea8035138d70bae1a278d3b57b743f8b3e (diff) | |
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.c | 8 |
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 8284f176a342..b5d6ea4904c0 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, | |||
| 504 | if (dev->nostat && count < 12) | 504 | if (dev->nostat && count < 12) |
| 505 | return -ENOMEM; | 505 | return -ENOMEM; |
| 506 | cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f); | 506 | cmd = MIDI_CMD_CONTROL|(ev->data.control.channel & 0x0f); |
| 507 | bytes[0] = ev->data.control.param & 0x007f; | 507 | bytes[0] = (ev->data.control.param & 0x3f80) >> 7; |
| 508 | bytes[1] = (ev->data.control.param & 0x3f80) >> 7; | 508 | bytes[1] = ev->data.control.param & 0x007f; |
| 509 | bytes[2] = ev->data.control.value & 0x007f; | 509 | bytes[2] = (ev->data.control.value & 0x3f80) >> 7; |
| 510 | bytes[3] = (ev->data.control.value & 0x3f80) >> 7; | 510 | bytes[3] = ev->data.control.value & 0x007f; |
| 511 | if (cmd != dev->lastcmd && !dev->nostat) { | 511 | if (cmd != dev->lastcmd && !dev->nostat) { |
| 512 | if (count < 9) | 512 | if (count < 9) |
| 513 | return -ENOMEM; | 513 | return -ENOMEM; |