summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorRussell King2011-12-06 00:20:17 +0100
committerRussell King2011-12-06 00:20:17 +0100
commit742eaa6a6e356a16788ce6530271de89bc4f8fb5 (patch)
tree12fc040daab06ac796c61c1d92bfad9bb054d1c1 /arch/arm/mach-mxs
parentARM: 7189/1: OMAP3: Fix build break in cpuidle34xx.c because of irq function (diff)
parentMerge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmk (diff)
downloadkernel-qcow2-linux-742eaa6a6e356a16788ce6530271de89bc4f8fb5.tar.gz
kernel-qcow2-linux-742eaa6a6e356a16788ce6530271de89bc4f8fb5.tar.xz
kernel-qcow2-linux-742eaa6a6e356a16788ce6530271de89bc4f8fb5.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Conflicts: arch/arm/common/gic.c arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r--arch/arm/mach-mxs/clock-mx28.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index 229ae3494216..da6e4aad177c 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -404,7 +404,7 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \
reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##dr); \
reg &= ~BM_CLKCTRL_##dr##_DIV; \
reg |= div << BP_CLKCTRL_##dr##_DIV; \
- if (reg | (1 << clk->enable_shift)) { \
+ if (reg & (1 << clk->enable_shift)) { \
pr_err("%s: clock is gated\n", __func__); \
return -EINVAL; \
} \