From 42417e1394002f9a9f591b14a31d49d12e3f2af5 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 19 Feb 2009 13:25:16 +0000 Subject: [PATCH] --- yaml --- r: 131561 b: refs/heads/master c: 41f3103fcfffff096c34f5267d7c9a26b44d89d3 h: refs/heads/master i: 131559: cff6cfd725891c6ba28e02bb5414d4fbbe389513 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/clock.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 42438c1591ad..0935fc6887bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22eb36f49e24e922ca6594a99157a3fcb92d3824 +refs/heads/master: 41f3103fcfffff096c34f5267d7c9a26b44d89d3 diff --git a/trunk/arch/arm/mach-omap2/clock.c b/trunk/arch/arm/mach-omap2/clock.c index e64549e4e326..ce4d46a4a838 100644 --- a/trunk/arch/arm/mach-omap2/clock.c +++ b/trunk/arch/arm/mach-omap2/clock.c @@ -746,7 +746,7 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) return -EINVAL; if (clk->usecount > 0) - _omap2_clk_disable(clk); + omap2_clk_disable(clk); /* Set new source value (previous dividers if any in effect) */ reg_val = __raw_readl(src_addr) & ~field_mask; @@ -759,11 +759,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) wmb(); } - if (clk->usecount > 0) - _omap2_clk_enable(clk); - clk->parent = new_parent; + if (clk->usecount > 0) + omap2_clk_enable(clk); + /* CLKSEL clocks follow their parents' rates, divided by a divisor */ clk->rate = new_parent->rate;