lkml.org 
[lkml]   [2009]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[03/20] ALSA: usb-audio: fix combine_word problem
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Julian Anastasov <ja@ssi.bg>
    commit f495088210c8b9e20791d995a8210170c68d2deb upstream.

    Fix combine_word problem where first octet is not
    read properly. The only affected place seems to be the
    INPUT_TERMINAL type. Before now, sound controls can be created
    with the output terminal's name which is a fallback mechanism
    used only for unknown input terminal types. For example,
    Line can wrongly appear as Speaker. After the change it
    should appear as Line.

    The side effect of this change can be that users
    can expect the wrong control name in their scripts or
    programs while now we return the correct one.

    Probably, these defines should use get_unaligned_le16 and
    friends.

    Signed-off-by: Julian Anastasov <ja@ssi.bg>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/usb/usbaudio.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)
    --- a/sound/usb/usbaudio.h
    +++ b/sound/usb/usbaudio.h
    @@ -209,7 +209,7 @@ struct snd_usb_midi_endpoint_info {
    /*
    */

    -#define combine_word(s) ((*s) | ((unsigned int)(s)[1] << 8))
    +#define combine_word(s) ((*(s)) | ((unsigned int)(s)[1] << 8))
    #define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16))
    #define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24))




    \
     
     \ /
      Last update: 2009-12-07 00:41    [from the cache]
    ©2003-2011 Jasper Spaans