From 951308f6cb6ca4d6bba66754d9b946e3af3e9326 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath Date: Mon, 9 Jul 2012 18:24:30 +0530 Subject: [PATCH] --- yaml --- r: 342456 b: refs/heads/master c: b797be1d4c079e78a3cb4e95f4a74274a4aef9f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 570f9a5a7cfb..d98148f43166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8577413c0a26e9bc0b412289640243f3b20f4517 +refs/heads/master: b797be1d4c079e78a3cb4e95f4a74274a4aef9f5 diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c index f38e4cefa2a5..c3d3e62a5ac2 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c @@ -1519,11 +1519,12 @@ static int _init_clocks(struct omap_hwmod *oh, void *data) pr_debug("omap_hwmod: %s: looking up clocks\n", oh->name); + if (soc_ops.init_clkdm) + ret |= soc_ops.init_clkdm(oh); + ret |= _init_main_clk(oh); ret |= _init_interface_clks(oh); ret |= _init_opt_clks(oh); - if (soc_ops.init_clkdm) - ret |= soc_ops.init_clkdm(oh); if (!ret) oh->_state = _HWMOD_STATE_CLKS_INITED;