lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[16/80] arm: mx28: fix bit operation in clock setting
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wolfram Sang <w.sang@pengutronix.de>

    commit c2735391fbc68feae10d6d14e60956c8106e725f upstream.

    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>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/arm/mach-mxs/clock-mx28.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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 *c
    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; \
    } \



    \
     
     \ /
      Last update: 2011-12-07 17:19    [W:0.023 / U:0.164 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site