i2c: stu300: use clk_prepare/unprepare
Make sure we prepare/unprepare the clock for the ST U300 I2C driver as is required by the clk API especially if you use common clock. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:

committed by
Wolfram Sang

parent
a55b44ac3f
commit
a3f24c0dbd
@@ -924,7 +924,7 @@ stu300_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
dev->speed = scl_frequency;
|
dev->speed = scl_frequency;
|
||||||
|
|
||||||
clk_enable(dev->clk);
|
clk_prepare_enable(dev->clk);
|
||||||
ret = stu300_init_hw(dev);
|
ret = stu300_init_hw(dev);
|
||||||
clk_disable(dev->clk);
|
clk_disable(dev->clk);
|
||||||
|
|
||||||
@@ -960,6 +960,7 @@ stu300_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
err_add_adapter:
|
err_add_adapter:
|
||||||
err_init_hw:
|
err_init_hw:
|
||||||
|
clk_unprepare(dev->clk);
|
||||||
free_irq(dev->irq, dev);
|
free_irq(dev->irq, dev);
|
||||||
err_no_irq:
|
err_no_irq:
|
||||||
iounmap(dev->virtbase);
|
iounmap(dev->virtbase);
|
||||||
@@ -1016,6 +1017,7 @@ stu300_remove(struct platform_device *pdev)
|
|||||||
free_irq(dev->irq, dev);
|
free_irq(dev->irq, dev);
|
||||||
iounmap(dev->virtbase);
|
iounmap(dev->virtbase);
|
||||||
release_mem_region(dev->phybase, dev->physize);
|
release_mem_region(dev->phybase, dev->physize);
|
||||||
|
clk_unprepare(dev->clk);
|
||||||
clk_put(dev->clk);
|
clk_put(dev->clk);
|
||||||
platform_set_drvdata(pdev, NULL);
|
platform_set_drvdata(pdev, NULL);
|
||||||
kfree(dev);
|
kfree(dev);
|
||||||
|
Reference in New Issue
Block a user