Skip to content

Commit

Permalink
i2c_bcm2708: Fix clock reference counting
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Elwell committed Feb 5, 2015
1 parent b0a1224 commit bec4f0a
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/i2c/busses/i2c-bcm2708.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -412,6 +418,8 @@ static int bcm2708_i2c_probe(struct platform_device *pdev)
iounmap(bi->base);
out_free_bi:
kfree(bi);
out_clk_disable:
clk_disable_unprepare(clk);
out_clk_put:
clk_put(clk);
return err;
Expand All @@ -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);

Expand Down

0 comments on commit bec4f0a

Please sign in to comment.