[libcamera-devel] [PATCH] libcamera: pipeline: rkisp1: Fix usage of uninitialised variable

Niklas Söderlund niklas.soderlund at ragnatech.se
Sat May 18 22:48:31 CEST 2019


Hi Laurent,

Thanks for your patch.

On 2019-05-18 23:44:26 +0300, Laurent Pinchart wrote:
> Commit 1a813a5c3ab7 introduced usage of an uninitialised variable. Fix it.
> 
> Fixes: 1a813a5c3ab7 ("libcamera: media_device: Handle media device fd in acquire() and release()")
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Sorry this was my mistake, wonder why my compiler did not catch this..

Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

> ---
>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index b395405c9ddb..96553bf2d9ef 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -159,12 +159,9 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera,
>  
>  		ret = link->setEnabled(enable);
>  		if (ret < 0)
> -			break;
> +			return ret;
>  	}
>  
> -	if (ret < 0)
> -		return ret;
> -
>  	/*
>  	 * Configure the format on the sensor output and propagate it through
>  	 * the pipeline.
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

-- 
Regards,
Niklas Söderlund


More information about the libcamera-devel mailing list