| Message ID | 20250212172803.1422136-1-mordan@ispras.ru |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] i2c: pxa: fix call balance of i2c->clk handling routines | expand |
Hi Vitalii, On Wed, Feb 12, 2025 at 08:28:03PM +0300, Vitalii Mordan wrote: > If the clock i2c->clk was not enabled in i2c_pxa_probe(), it should not be > disabled in any path. > > Found by Linux Verification Center (linuxtesting.org) with Klever. here I added a blank line. > Signed-off-by: Vitalii Mordan <mordan@ispras.ru> ... > - clk_prepare_enable(i2c->clk); > + ret = clk_prepare_enable(i2c->clk); > + if (ret) { > + return dev_err_probe(&dev->dev, ret, > + "failed to enable clock\n"); > + } I removed the brackets here that are not necessary. Merged to i2c/i2c-host. Thanks, Andi > > if (i2c->use_pio) { > i2c->adap.algo = &i2c_pxa_pio_algorithm; > -- > 2.25.1 >
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index cb6988482673..c4e938c667f0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1503,7 +1503,11 @@ static int i2c_pxa_probe(struct platform_device *dev) i2c->adap.name); } - clk_prepare_enable(i2c->clk); + ret = clk_prepare_enable(i2c->clk); + if (ret) { + return dev_err_probe(&dev->dev, ret, + "failed to enable clock\n"); + } if (i2c->use_pio) { i2c->adap.algo = &i2c_pxa_pio_algorithm;
If the clock i2c->clk was not enabled in i2c_pxa_probe(), it should not be disabled in any path. Found by Linux Verification Center (linuxtesting.org) with Klever. Signed-off-by: Vitalii Mordan <mordan@ispras.ru> --- v2: Use dev_err_probe() helper function, as per Andi Shyti request. drivers/i2c/busses/i2c-pxa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)