2024-01-05 14:40:00

by Christophe JAILLET

Subject: [PATCH] i2c: wmt: Fix an error handling path in wmt_i2c_probe()

wmt_i2c_reset_hardware() calls clk_prepare_enable(). So, should an error
occurs after it, it should be undone by a corresponding
clk_disable_unprepare() call, as already done in the remove function.

Fixes: 560746eb79d3 ("i2c: vt8500: Add support for I2C bus on Wondermedia SoCs")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/i2c/busses/i2c-wmt.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
index ec2a8da134e5..198afee5233c 100644
--- a/drivers/i2c/busses/i2c-wmt.c
+++ b/drivers/i2c/busses/i2c-wmt.c
@@ -378,11 +378,15 @@ static int wmt_i2c_probe(struct platform_device *pdev)

err = i2c_add_adapter(adap);
if (err)
- return err;
+ goto err_disable_clk;

platform_set_drvdata(pdev, i2c_dev);

return 0;
+
+err_disable_clk:
+ clk_disable_unprepare(i2c_dev->clk);
+ return err;
}

static void wmt_i2c_remove(struct platform_device *pdev)
--
2.34.1

2024-03-06 12:13:52

by Andi Shyti

Subject: Re: [PATCH] i2c: wmt: Fix an error handling path in wmt_i2c_probe()

Hi

On Fri, 05 Jan 2024 15:39:35 +0100, Christophe JAILLET wrote:
> wmt_i2c_reset_hardware() calls clk_prepare_enable(). So, should an error
> occurs after it, it should be undone by a corresponding
> clk_disable_unprepare() call, as already done in the remove function.
>
>

Applied to i2c/i2c-host-fixes on

git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git

Thank you,
Andi

Patches applied
===============
[1/1] i2c: wmt: Fix an error handling path in wmt_i2c_probe()
commit: 78c1dbed365217ee751531e24c18da77795074d9