2018-02-07 21:12:38

by Kieran Bingham

Subject: [PATCH] media: i2c: adv748x: Fix cleanup jump on chip identification

From: Kieran Bingham <[email protected]>

The error handling for the adv748x_identify_chip() call erroneously
jumps to the err_cleanup_clients label before the clients have been
established.

Correct this by jumping to the next (and correct) label in the cleanup
code: err_cleanup_dt.

Fixes: 3e89586a64df ("media: i2c: adv748x: add adv748x driver")

Signed-off-by: Kieran Bingham <[email protected]>
---
drivers/media/i2c/adv748x/adv748x-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
index 6d62b817ed00..6ccaad7e9eca 100644
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -651,7 +651,7 @@ static int adv748x_probe(struct i2c_client *client,
ret = adv748x_identify_chip(state);
if (ret) {
adv_err(state, "Failed to identify chip");
- goto err_cleanup_clients;
+ goto err_cleanup_dt;
}

/* Configure remaining pages as I2C clients with regmap access */
--
2.7.4

2018-02-09 15:35:38

by Niklas Söderlund

Subject: Re: [PATCH] media: i2c: adv748x: Fix cleanup jump on chip identification

Hi Kieran,

Thanks for your patch.

On 2018-02-07 21:11:35 +0000, Kieran Bingham wrote:
> From: Kieran Bingham <[email protected]>
>
> The error handling for the adv748x_identify_chip() call erroneously
> jumps to the err_cleanup_clients label before the clients have been
> established.
>
> Correct this by jumping to the next (and correct) label in the cleanup
> code: err_cleanup_dt.
>
> Fixes: 3e89586a64df ("media: i2c: adv748x: add adv748x driver")
>
> Signed-off-by: Kieran Bingham <[email protected]>

Reviewed-by: Niklas S?derlund <[email protected]>

> ---
> drivers/media/i2c/adv748x/adv748x-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
> index 6d62b817ed00..6ccaad7e9eca 100644
> --- a/drivers/media/i2c/adv748x/adv748x-core.c
> +++ b/drivers/media/i2c/adv748x/adv748x-core.c
> @@ -651,7 +651,7 @@ static int adv748x_probe(struct i2c_client *client,
> ret = adv748x_identify_chip(state);
> if (ret) {
> adv_err(state, "Failed to identify chip");
> - goto err_cleanup_clients;
> + goto err_cleanup_dt;
> }
>
> /* Configure remaining pages as I2C clients with regmap access */
> --
> 2.7.4
>

--
Regards,
Niklas S?derlund