Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[cascardo/linux.git] / arch / arm / mach-davinci / board-dm365-evm.c

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 1b4a8ad..5d49c75 100644 (file)
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -478,7 +478,7 @@ static void __init evm_init_cpld(void)
        aemif_clk = clk_get(NULL, "aemif");
        if (IS_ERR(aemif_clk))
                return;
-       clk_enable(aemif_clk);
+       clk_prepare_enable(aemif_clk);
 
        if (request_mem_region(DM365_ASYNC_EMIF_DATA_CE1_BASE, SECTION_SIZE,
                        "cpld") == NULL)
@@ -489,7 +489,7 @@ static void __init evm_init_cpld(void)
                                SECTION_SIZE);
 fail:
                pr_err("ERROR: can't map CPLD\n");
-               clk_disable(aemif_clk);
+               clk_disable_unprepare(aemif_clk);
                return;
        }