Re: [PATCH] media: i2c: fix an uninitialized error code

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Arnd,

Thanks for the patch.

On Thu, 2020-12-03 at 23:29 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
> 
> Clang points out that the error handling in ov02a10_s_stream() is
> broken, and just returns a random error code:
> 
> drivers/media/i2c/ov02a10.c:537:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
>         if (ov02a10->streaming == on)
>             ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/media/i2c/ov02a10.c:568:9: note: uninitialized use occurs here
>         return ret;
>                ^~~
> drivers/media/i2c/ov02a10.c:537:2: note: remove the 'if' if its condition is always false
>         if (ov02a10->streaming == on)
>         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/media/i2c/ov02a10.c:533:9: note: initialize the variable 'ret' to silence this warning
>         int ret;
> 
> I assume that -EBUSY is the intended error code, so use that.
> 
> Fixes: 91807efbe8ec ("media: i2c: add OV02A10 image sensor driver")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
>  drivers/media/i2c/ov02a10.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/i2c/ov02a10.c b/drivers/media/i2c/ov02a10.c
> index 391718136ade..7ee9c904d9b5 100644
> --- a/drivers/media/i2c/ov02a10.c
> +++ b/drivers/media/i2c/ov02a10.c
> @@ -534,8 +534,10 @@ static int ov02a10_s_stream(struct v4l2_subdev *sd, int on)
>  
>  	mutex_lock(&ov02a10->mutex);
>  
> -	if (ov02a10->streaming == on)
> +	if (ov02a10->streaming == on) {
> +		ret = -EBUSY;
>  		goto unlock_and_return;
> +	}
>  
>  	if (on) {
>  		ret = pm_runtime_get_sync(&client->dev);

Only if sensor fails to stream on, ret can return a negative error code.
Thus ret above needs to be initialized to '0'.
Also you could fix the clang error like this.

static int ov02a10_s_stream(struct v4l2_subdev *sd, int on)
{
	struct ov02a10 *ov02a10 = to_ov02a10(sd);
	...
	int ret = 0;

	...
	if (ov02a10->streaming == on)
		goto unlock_and_return;

	...
}





[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux