From 06953fd13e4820112fb58978872da5b313fba400 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Sat, 21 Aug 2010 16:24:04 +0800 Subject: [PATCH] --- yaml --- r: 210427 b: refs/heads/master c: 7f67bff58662604874778e6853e5c394f944e554 h: refs/heads/master i: 210425: d8073ce362807658e89121a578534efff9d9a61a 210423: 6f0c4526fa69532b73c2248878f2469ffb761591 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx5/clock-mx51.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d860c58f67e5..8d6591db38ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a38b372fc2a3d8fe7ddbeab94d4c8bcb721f2403 +refs/heads/master: 7f67bff58662604874778e6853e5c394f944e554 diff --git a/trunk/arch/arm/mach-mx5/clock-mx51.c b/trunk/arch/arm/mach-mx5/clock-mx51.c index 6af69def357f..57c10a9926cc 100644 --- a/trunk/arch/arm/mach-mx5/clock-mx51.c +++ b/trunk/arch/arm/mach-mx5/clock-mx51.c @@ -56,7 +56,7 @@ static void _clk_ccgr_disable(struct clk *clk) { u32 reg; reg = __raw_readl(clk->enable_reg); - reg &= ~(MXC_CCM_CCGRx_MOD_OFF << clk->enable_shift); + reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift); __raw_writel(reg, clk->enable_reg); }