[PATCH] i2c-nomadik: Fixup clock handling
From: Ulf Hansson <hidden>
Date: 2012-09-20 15:20:47
Also in:
linux-i2c
Subsystem:
arm/nomadik/ux500 architectures, i2c subsystem, i2c subsystem host drivers, the rest · Maintainers:
Linus Walleij, Wolfram Sang, Andi Shyti, Linus Torvalds
From: Philippe Begnic <redacted> Make sure to clk_prepare as well as clk_enable. Signed-off-by: Philippe Begnic <redacted> Signed-off-by: Ulf Hansson <redacted> --- drivers/i2c/busses/i2c-nomadik.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 1b898b6..3eeae52 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c@@ -642,7 +642,11 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, pm_runtime_get_sync(&dev->adev->dev); - clk_enable(dev->clk); + status = clk_prepare_enable(dev->clk); + if (status) { + dev_err(&dev->adev->dev, "can't prepare_enable clock\n"); + goto out_clk; + } status = init_hw(dev); if (status)
@@ -669,7 +673,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, } out: - clk_disable(dev->clk); + clk_disable_unprepare(dev->clk); +out_clk: pm_runtime_put_sync(&dev->adev->dev); dev->busy = false;
--
1.7.10