lkml.org 
[lkml]   [2022]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.16 027/217] media: atomisp: handle errors at sh_css_create_isp_params()
    Date
    From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

    [ Upstream commit 58043dbf6d1ae9deab4f5aa1e039c70112017682 ]

    The succ var tracks memory allocation erros on this function.

    Fix it, in order to stop this W=1 Werror in clang:

    drivers/staging/media/atomisp/pci/sh_css_params.c:2430:7: error: variable 'succ' set but not used [-Werror,-Wunused-but-set-variable]
    bool succ = true;
    ^

    Reviewed-by: Nathan Chancellor <nathan@kernel.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/atomisp/pci/sh_css_params.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
    index dbd3bfe3d343c..ccc0078795648 100644
    --- a/drivers/staging/media/atomisp/pci/sh_css_params.c
    +++ b/drivers/staging/media/atomisp/pci/sh_css_params.c
    @@ -2431,7 +2431,7 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
    unsigned int i;
    struct sh_css_ddr_address_map *ddr_ptrs;
    struct sh_css_ddr_address_map_size *ddr_ptrs_size;
    - int err = 0;
    + int err;
    size_t params_size;
    struct ia_css_isp_parameters *params =
    kvmalloc(sizeof(struct ia_css_isp_parameters), GFP_KERNEL);
    @@ -2473,7 +2473,11 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
    succ &= (ddr_ptrs->macc_tbl != mmgr_NULL);

    *isp_params_out = params;
    - return err;
    +
    + if (!succ)
    + return -ENOMEM;
    +
    + return 0;
    }

    static bool
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-18 03:25    [W:4.154 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site