summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Begnic <philippe.begnic@stericsson.com>2012-10-10 13:02:26 +0200
committerWolfram Sang <w.sang@pengutronix.de>2012-11-02 10:52:52 +0100
commit817315f57408b1a9c78cbc7ff2bf186da45ddcc1 (patch)
tree668e17d69da561786316137169a3ee1f5bdeb757
parent82fa63bd6b87969dfde0139dbede243380b087d6 (diff)
downloadlinux-sh-817315f57408b1a9c78cbc7ff2bf186da45ddcc1.tar.gz
i2c-nomadik: Fixup clock handling
Make sure to clk_prepare as well as clk_enable. Signed-off-by: Philippe Begnic <philippe.begnic@stericsson.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 698d7acb0f08..02c3115a2dfa 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -644,7 +644,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)
@@ -671,7 +675,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;