diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-07 14:59:36 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 11:03:41 -0400 |
commit | 60178b6329259457013d0e39cbee22aec0230dfb (patch) | |
tree | 79b35d50105be3bd992f15af38fa5307b56f2480 /drivers/w1/masters | |
parent | c943740ccd7ccfc7e92c80d194d0a8a80ab7b55c (diff) |
w1 i.MX: prepare/unprepare clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/w1/masters')
-rw-r--r-- | drivers/w1/masters/mxc_w1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index a3b6a74c67a7..1cc61a700fa8 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
@@ -138,7 +138,7 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev) | |||
138 | goto failed_ioremap; | 138 | goto failed_ioremap; |
139 | } | 139 | } |
140 | 140 | ||
141 | clk_enable(mdev->clk); | 141 | clk_prepare_enable(mdev->clk); |
142 | __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); | 142 | __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); |
143 | 143 | ||
144 | mdev->bus_master.data = mdev; | 144 | mdev->bus_master.data = mdev; |
@@ -178,7 +178,7 @@ static int __devexit mxc_w1_remove(struct platform_device *pdev) | |||
178 | 178 | ||
179 | iounmap(mdev->regs); | 179 | iounmap(mdev->regs); |
180 | release_mem_region(res->start, resource_size(res)); | 180 | release_mem_region(res->start, resource_size(res)); |
181 | clk_disable(mdev->clk); | 181 | clk_disable_unprepare(mdev->clk); |
182 | clk_put(mdev->clk); | 182 | clk_put(mdev->clk); |
183 | 183 | ||
184 | platform_set_drvdata(pdev, NULL); | 184 | platform_set_drvdata(pdev, NULL); |