media: atomisp: handle errors at sh_css_create_isp_params()
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 11 Nov 2021 23:04:09 +0000 (23:04 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:04:26 +0000 (11:04 +0100)
[ 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

index dbd3bfe..ccc0078 100644 (file)
@@ -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