lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 069/124] ASoC: Intel: sst: Fix the return value of 'sst_send_byte_stream_mrfld()'
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit eaadb1caa966a91128297b754e90b7c92b350a00 ]

    In some error handling paths, an error code is assiegned to 'ret'.
    However, the function always return 0.

    Fix it and return the error code if such an error paths is taken.

    Fixes: 3d9ff34622ba ("ASoC: Intel: sst: add stream operations")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    sound/soc/intel/atom/sst/sst_stream.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/intel/atom/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c
    index 65e257b17a7e..20f5066fefb9 100644
    --- a/sound/soc/intel/atom/sst/sst_stream.c
    +++ b/sound/soc/intel/atom/sst/sst_stream.c
    @@ -220,7 +220,7 @@ int sst_send_byte_stream_mrfld(struct intel_sst_drv *sst_drv_ctx,
    sst_free_block(sst_drv_ctx, block);
    out:
    test_and_clear_bit(pvt_id, &sst_drv_ctx->pvt_id);
    - return 0;
    + return ret;
    }

    /*
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 23:28    [W:4.074 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site