summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPhil Elwell <phil@raspberrypi.org>2015-02-05 16:01:44 +0000
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:11:46 +0100
commitbc82027bbcb48b12782862facc5f8a3c44224192 (patch)
tree2986e3d81eaaad0c27361764d4d53a4dabba82c2 /drivers
parent8036f2caa11d5e36a5dc86f216c1f53025aa77f8 (diff)
downloadlinux-bc82027bbcb48b12782862facc5f8a3c44224192.tar.gz
i2c_bcm2708: Fix clock reference counting
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-bcm2708.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
index 526129b98b89..fda59ba7ae30 100644
--- a/drivers/i2c/busses/i2c-bcm2708.c
+++ b/drivers/i2c/busses/i2c-bcm2708.c
@@ -337,11 +337,17 @@ static int bcm2708_i2c_probe(struct platform_device *pdev)
return PTR_ERR(clk);
}
+ err = clk_prepare_enable(clk);
+ if (err) {
+ dev_err(&pdev->dev, "could not enable clk: %d\n", err);
+ goto out_clk_put;
+ }
+
bcm2708_i2c_init_pinmode(pdev->id);
bi = kzalloc(sizeof(*bi), GFP_KERNEL);
if (!bi)
- goto out_clk_put;
+ goto out_clk_disable;
platform_set_drvdata(pdev, bi);
@@ -412,6 +418,8 @@ out_iounmap:
iounmap(bi->base);
out_free_bi:
kfree(bi);
+out_clk_disable:
+ clk_disable_unprepare(clk);
out_clk_put:
clk_put(clk);
return err;
@@ -426,7 +434,7 @@ static int bcm2708_i2c_remove(struct platform_device *pdev)
i2c_del_adapter(&bi->adapter);
free_irq(bi->irq, bi);
iounmap(bi->base);
- clk_disable(bi->clk);
+ clk_disable_unprepare(bi->clk);
clk_put(bi->clk);
kfree(bi);