lkml.org 
[lkml]   [2009]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 089/108] sound: seq_midi_event: fix decoding of (N)RPN events
    2.6.30-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Clemens Ladisch <clemens@ladisch.de>

    commit 6423f9ea8035138d70bae1a278d3b57b743f8b3e upstream.

    When decoding (N)RPN sequencer events into raw MIDI commands, the
    extra_decode_xrpn() function had accidentally swapped the MSB and LSB
    controller values of both the parameter number and the data value.

    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/core/seq/seq_midi_event.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- 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_
    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;



    \
     
     \ /
      Last update: 2009-07-01 03:33    [W:4.067 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site