From: Sascha Hauer Date: Wed, 7 Mar 2012 19:59:36 +0000 (+0100) Subject: w1 i.MX: prepare/unprepare clock X-Git-Tag: v3.5-rc1~71^2~4^2~23 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=60178b6329259457013d0e39cbee22aec0230dfb;p=~emulex%2Finfiniband.git w1 i.MX: prepare/unprepare clock Signed-off-by: Sascha Hauer --- diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index a3b6a74c67a..1cc61a700fa 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) 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; @@ -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);