Commit c2735391 authored Sep 10, 2011 by Wolfram Sang Committed by Arnd Bergmann Nov 23, 2011

arm: mx28: fix bit operation in clock setting

reg | (1 << clk->enable_shift) always evaluates to true. Switch it
to & which makes much more sense. Same fix as 13be9f00 (ARM i.MX28: fix
bit operation) at a different location.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: stable@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent 9b7c547f

arch/arm/mach-mxs/clock-mx28.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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; \
		} \