Re: [PATCH] media: atomisp: restore missing 'return' statement

Kees Cook
2021-08-13T16:38:09Z

On Mon, Aug 02, 2021 at 04:38:14PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The input_system_configure_channel_sensor() function lost its final
> return code in a previous patch:
>
> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c: In function 'input_system_configure_channel_sensor':
> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:1649:1: error: control reaches end of non-void function [-Werror=return-type]
>
> Restore what was there originally.
>
> Fixes: 728a5c64ae5f ("media: atomisp: remove dublicate code")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I hit this too. Thanks!

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
> .../media/atomisp/pci/hive_isp_css_common/host/input_system.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
> index 8e085dda0c18..712e01c37870 100644
> --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
> +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
> @@ -1646,6 +1646,8 @@ static input_system_err_t input_system_configure_channel_sensor(
> default:
> return INPUT_SYSTEM_ERR_PARAMETER_NOT_SUPPORTED;
> }
> +
> + return INPUT_SYSTEM_ERR_NO_ERROR;
> }
>
> // Test flags and set structure.
> --
> 2.29.2
>

--
Kees Cook