From 4288726c470612181951b87e6e27211f1e6d9603 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 7 Mar 2012 20:59:36 +0100 Subject: [PATCH] --- yaml --- r: 308231 b: refs/heads/master c: 60178b6329259457013d0e39cbee22aec0230dfb h: refs/heads/master i: 308229: b3cb89edaff1d9ad5a899cadd8eac8cca672bbb2 308227: d30891c4a2d54dfcde7045e41fb5f27675814cfd 308223: 093901882938352c356c35a06307a0e852c58328 v: v3 --- [refs] | 2 +- trunk/drivers/w1/masters/mxc_w1.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a820fcd34c2..6f6ab3e6c711 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c943740ccd7ccfc7e92c80d194d0a8a80ab7b55c +refs/heads/master: 60178b6329259457013d0e39cbee22aec0230dfb diff --git a/trunk/drivers/w1/masters/mxc_w1.c b/trunk/drivers/w1/masters/mxc_w1.c index a3b6a74c67a7..1cc61a700fa8 100644 --- a/trunk/drivers/w1/masters/mxc_w1.c +++ b/trunk/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);