Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 817315f5 authored by Philippe Begnic's avatar Philippe Begnic Committed by Wolfram Sang
Browse files

i2c-nomadik: Fixup clock handling 



Make sure to clk_prepare as well as clk_enable.

Signed-off-by: default avatarPhilippe Begnic <philippe.begnic@stericsson.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 82fa63bd

drivers/i2c/busses/i2c-nomadik.c

+7 −2
Original line number Diff line number Diff line
@@ -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;