[PATCH] media: i2c: vgxy61: Fix an error handling path in vgxy61_detect()

Christophe JAILLET posted 1 patch 1 month, 3 weeks ago
drivers/media/i2c/vgxy61.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] media: i2c: vgxy61: Fix an error handling path in vgxy61_detect()
Posted by Christophe JAILLET 1 month, 3 weeks ago
If cci_read() fails, 'st' is set to 0 in cci_read(), so we return success,
instead of the expected error code.

Fix it and return the expected error.

Fixes: 9a6d7f2ba2b9 ("media: i2c: st-vgxy61: Convert to CCI register access helpers")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/media/i2c/vgxy61.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/i2c/vgxy61.c b/drivers/media/i2c/vgxy61.c
index 30378e962016..8034e21051be 100644
--- a/drivers/media/i2c/vgxy61.c
+++ b/drivers/media/i2c/vgxy61.c
@@ -1617,7 +1617,7 @@ static int vgxy61_detect(struct vgxy61_dev *sensor)
 
 	ret = cci_read(sensor->regmap, VGXY61_REG_NVM, &st, NULL);
 	if (ret < 0)
-		return st;
+		return ret;
 	if (st != VGXY61_NVM_OK)
 		dev_warn(&client->dev, "Bad nvm state got %u\n", (u8)st);
 
-- 
2.46.2
Re: [PATCH] media: i2c: vgxy61: Fix an error handling path in vgxy61_detect()
Posted by Benjamin Mugnier 1 month, 3 weeks ago
Hi Christophe,

Thank you for your patch.

On 10/3/24 19:53, Christophe JAILLET wrote:
> If cci_read() fails, 'st' is set to 0 in cci_read(), so we return success,
> instead of the expected error code.
> 
> Fix it and return the expected error.
> 
> Fixes: 9a6d7f2ba2b9 ("media: i2c: st-vgxy61: Convert to CCI register access helpers")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Benjamin Mugnier <benjamin.mugnier@foss.st.com>

> ---
>  drivers/media/i2c/vgxy61.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/i2c/vgxy61.c b/drivers/media/i2c/vgxy61.c
> index 30378e962016..8034e21051be 100644
> --- a/drivers/media/i2c/vgxy61.c
> +++ b/drivers/media/i2c/vgxy61.c
> @@ -1617,7 +1617,7 @@ static int vgxy61_detect(struct vgxy61_dev *sensor)
>  
>  	ret = cci_read(sensor->regmap, VGXY61_REG_NVM, &st, NULL);
>  	if (ret < 0)
> -		return st;
> +		return ret;
>  	if (st != VGXY61_NVM_OK)
>  		dev_warn(&client->dev, "Bad nvm state got %u\n", (u8)st);
>  

-- 
Regards,

Benjamin