lkml.org 
[lkml]   [2016]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.3 104/200] ALSA: bebob: Use a signed return type for get_formation_index
    Date
    4.3-stable review patch.  If anyone has any objections, please let me know.

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

    From: Lucas Tanure <tanure@linux.com>

    commit 07905298e4d5777eb58516cdc242f7ac1ca387a2 upstream.

    The return type "unsigned int" was used by the get_formation_index function
    despite of the aspect that it will eventually return a negative error code.
    So, change to signed int and get index by reference in the parameters.

    Done with the help of Coccinelle.

    [Fix the missing braces suggested by Julia Lawall -- tiwai]

    Signed-off-by: Lucas Tanure <tanure@linux.com>
    Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
    Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/firewire/bebob/bebob_stream.c | 14 +++++++++-----
    1 file changed, 9 insertions(+), 5 deletions(-)

    --- a/sound/firewire/bebob/bebob_stream.c
    +++ b/sound/firewire/bebob/bebob_stream.c
    @@ -47,14 +47,16 @@ static const unsigned int bridgeco_freq_
    [6] = 0x07,
    };

    -static unsigned int
    -get_formation_index(unsigned int rate)
    +static int
    +get_formation_index(unsigned int rate, unsigned int *index)
    {
    unsigned int i;

    for (i = 0; i < ARRAY_SIZE(snd_bebob_rate_table); i++) {
    - if (snd_bebob_rate_table[i] == rate)
    - return i;
    + if (snd_bebob_rate_table[i] == rate) {
    + *index = i;
    + return 0;
    + }
    }
    return -EINVAL;
    }
    @@ -424,7 +426,9 @@ make_both_connections(struct snd_bebob *
    goto end;

    /* confirm params for both streams */
    - index = get_formation_index(rate);
    + err = get_formation_index(rate, &index);
    + if (err < 0)
    + goto end;
    pcm_channels = bebob->tx_stream_formations[index].pcm;
    midi_channels = bebob->tx_stream_formations[index].midi;
    amdtp_stream_set_parameters(&bebob->tx_stream,

    \
     
     \ /
      Last update: 2016-02-15 01:21    [W:4.148 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site