Skip to content

Commit

Permalink
w1 i.MX: prepare/unprepare clock
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Sascha Hauer committed Apr 25, 2012
1 parent c943740 commit 60178b6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/w1/masters/mxc_w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
goto failed_ioremap;
}

clk_enable(mdev->clk);
clk_prepare_enable(mdev->clk);
__raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);

mdev->bus_master.data = mdev;
Expand Down Expand Up @@ -178,7 +178,7 @@ static int __devexit mxc_w1_remove(struct platform_device *pdev)

iounmap(mdev->regs);
release_mem_region(res->start, resource_size(res));
clk_disable(mdev->clk);
clk_disable_unprepare(mdev->clk);
clk_put(mdev->clk);

platform_set_drvdata(pdev, NULL);
Expand Down

0 comments on commit 60178b6

Please sign in to comment.