From 2b919a1a21a0eb61d81baec5e7b04c5846f84e5c Mon Sep 17 00:00:00 2001 From: "m-karicheri2@ti.com" Date: Wed, 12 Sep 2012 21:06:19 +0000 Subject: [PATCH] --- yaml --- r: 332758 b: refs/heads/master c: ea73fe7f0d562154975a77fe77ae3da6ab4d3e77 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/davinci_nand.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dc53ceb735df..2af8d01cde1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ed089c0a1bc6f371dbcf97fb4e8218deaa0ae17 +refs/heads/master: ea73fe7f0d562154975a77fe77ae3da6ab4d3e77 diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index f386b3c55031..df1ab7dc3440 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -724,7 +724,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev) goto err_clk; } - ret = clk_enable(info->clk); + ret = clk_prepare_enable(info->clk); if (ret < 0) { dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n", ret); @@ -835,7 +835,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev) err_scan: err_timing: - clk_disable(info->clk); + clk_disable_unprepare(info->clk); err_clk_enable: clk_put(info->clk); @@ -872,7 +872,7 @@ static int __exit nand_davinci_remove(struct platform_device *pdev) nand_release(&info->mtd); - clk_disable(info->clk); + clk_disable_unprepare(info->clk); clk_put(info->clk); kfree(info);