]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ARM i.MX28: fix bit operation
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 14 Jan 2011 13:30:03 +0000 (14:30 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 24 Jan 2011 08:01:04 +0000 (09:01 +0100)
reg | (1 << clk->enable_shift) always evaluates to true. Switch it
to & which makes much more sense

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
arch/arm/mach-mxs/clock-mx28.c

index 56312c092a9ea08efc0196fb5f87e6f31b12d132..4146b38605de3d75ed60cde03433e015d6415b28 100644 (file)
@@ -355,7 +355,7 @@ static int name##_set_rate(struct clk *clk, unsigned long rate)             \
        } else {                                                        \
                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;                                 \
                }                                                       \