Skip to content

L
linux
Commit 60178b63 authored by Sascha Hauer's avatar Sascha Hauer
Browse files
Options

w1 i.MX: prepare/unprepare clock 

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent c943740c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/w1/masters/mxc_w1.c
View file @ 60178b63
...@@ -138,7 +138,7 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev) ...@@ -138,7 +138,7 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev)
goto failed_ioremap; goto failed_ioremap;
} }
clk_enable(mdev->clk); clk_prepare_enable(mdev->clk);
__raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
mdev->bus_master.data = mdev; mdev->bus_master.data = mdev;
...@@ -178,7 +178,7 @@ static int __devexit mxc_w1_remove(struct platform_device *pdev) ...@@ -178,7 +178,7 @@ static int __devexit mxc_w1_remove(struct platform_device *pdev)
iounmap(mdev->regs); iounmap(mdev->regs);
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
clk_disable(mdev->clk); clk_disable_unprepare(mdev->clk);
clk_put(mdev->clk); clk_put(mdev->clk);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7