From a8ade273d2678306756b076e0428437227ed2b68 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 12 Jun 2012 19:33:30 +0200 Subject: [PATCH] --- yaml --- r: 319155 b: refs/heads/master c: a3f24c0dbd0b9a7624d077b3c1841dde267aaa6c h: refs/heads/master i: 319153: 194122dd07bfd2686a119b85a49eea42c76b8f11 319151: b2a425e57a7e893e999c0ceca59ef0bdf04ca971 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-stu300.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27d27e0599b7..6799ecaa4cf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a55b44ac3fe07d4e89486817732b596fce6ab9f6 +refs/heads/master: a3f24c0dbd0b9a7624d077b3c1841dde267aaa6c diff --git a/trunk/drivers/i2c/busses/i2c-stu300.c b/trunk/drivers/i2c/busses/i2c-stu300.c index 4d44af181f37..79b785150c15 100644 --- a/trunk/drivers/i2c/busses/i2c-stu300.c +++ b/trunk/drivers/i2c/busses/i2c-stu300.c @@ -924,7 +924,7 @@ stu300_probe(struct platform_device *pdev) dev->speed = scl_frequency; - clk_enable(dev->clk); + clk_prepare_enable(dev->clk); ret = stu300_init_hw(dev); clk_disable(dev->clk); @@ -960,6 +960,7 @@ stu300_probe(struct platform_device *pdev) err_add_adapter: err_init_hw: + clk_unprepare(dev->clk); free_irq(dev->irq, dev); err_no_irq: iounmap(dev->virtbase); @@ -1016,6 +1017,7 @@ stu300_remove(struct platform_device *pdev) free_irq(dev->irq, dev); iounmap(dev->virtbase); release_mem_region(dev->phybase, dev->physize); + clk_unprepare(dev->clk); clk_put(dev->clk); platform_set_drvdata(pdev, NULL); kfree(dev);