w1 i.MX: prepare/unprepare clock
authorSascha Hauer <s.hauer@pengutronix.de>
Wed, 7 Mar 2012 19:59:36 +0000 (20:59 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Wed, 25 Apr 2012 15:03:41 +0000 (17:03 +0200)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/w1/masters/mxc_w1.c

index a3b6a74c67a729b93949a1e06c89c40cf252c1a1..1cc61a700fa84bd7830bd37f4b3d069438f4ba87 100644 (file)
@@ -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);