From 4c14ffd22a7d2fcec4dbca440c2165d8bb42a887 Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Thu, 20 May 2010 12:31:10 -0600 Subject: [PATCH] --- yaml --- r: 196215 b: refs/heads/master c: 63403384233e3f58514eea891003458dedd43c12 h: refs/heads/master i: 196213: d944e0cc8f79ea6f5ee76bb47463d2d451286246 196211: acc95a2b34a40480796de454d61fce6798518ce1 196207: 7cddfacd4525c0f435c3e3cecfb7e7c2701b3a3b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ac6f90726053..b4f4dd5fa66d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c2c02961ea39d7bbe4d87f362ab3173a424794b +refs/heads/master: 63403384233e3f58514eea891003458dedd43c12 diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c index b6031e468def..2fff39ff4080 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c @@ -404,21 +404,20 @@ static int _del_initiator_dep(struct omap_hwmod *oh, struct omap_hwmod *init_oh) */ static int _init_main_clk(struct omap_hwmod *oh) { - struct clk *c; int ret = 0; if (!oh->main_clk) return 0; - c = omap_clk_get_by_name(oh->main_clk); - if (!c) + oh->_clk = omap_clk_get_by_name(oh->main_clk); + if (!oh->_clk) pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n", oh->name, oh->main_clk); - ret = -EINVAL; - oh->_clk = c; + return -EINVAL; - WARN(!c->clkdm, "omap_hwmod: %s: missing clockdomain for %s.\n", - oh->main_clk, c->name); + if (!oh->_clk->clkdm) + pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n", + oh->main_clk, oh->_clk->name); return ret; }