summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-24 08:26:33 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-24 09:01:55 +0100
commit71b71518c7b97bae7317b452bf7fba067e38030a (patch)
tree74cc12643c4d62a074737de5f06212f17e8ee057 /arch
parent5080e9c981473cd3e5d1571ff8d6dc39ba2777b1 (diff)
downloadtalos-obmc-linux-71b71518c7b97bae7317b452bf7fba067e38030a.tar.gz
talos-obmc-linux-71b71518c7b97bae7317b452bf7fba067e38030a.zip
ARM i.MX23: use correct register for setting the rate
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mxs/clock-mx23.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c
index b1a362ebfded..72069243aec4 100644
--- a/arch/arm/mach-mxs/clock-mx23.c
+++ b/arch/arm/mach-mxs/clock-mx23.c
@@ -304,7 +304,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; \
} \
OpenPOWER on IntegriCloud