lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 122/343] staging: rtlwifi: Use proper enum for return in halmac_parse_psd_data_88xx
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit e8edc32d70a4e09160835792eb5d1af71a0eec14 ]

    Clang warns:

    drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c:2472:11:
    warning: implicit conversion from enumeration type 'enum
    halmac_cmd_process_status' to different enumeration type 'enum
    halmac_ret_status' [-Wenum-conversion]
    return HALMAC_CMD_PROCESS_ERROR;
    ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~
    1 warning generated.

    Fix this by using the proper enum for allocation failures,
    HALMAC_RET_MALLOC_FAIL, which is used in the rest of this file.

    Fixes: e4b08e16b7d9 ("staging: r8822be: check kzalloc return or bail")
    Link: https://github.com/ClangBuiltLinux/linux/issues/375
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Reviewed-by: Nicholas Mc Guire <hofrat@osadl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
    index 15091ee587dbf..65edd14a1147a 100644
    --- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
    +++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
    @@ -2495,7 +2495,7 @@ halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,
    if (!psd_set->data) {
    psd_set->data = kzalloc(psd_set->data_size, GFP_KERNEL);
    if (!psd_set->data)
    - return HALMAC_CMD_PROCESS_ERROR;
    + return HALMAC_RET_MALLOC_FAIL;
    }

    if (segment_id == 0)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 10:54    [W:4.018 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site