[PATCH] arm: mx28: fix bit operation in clock setting

[Wolfram Sang]

On Sat, Sep 10, 2011 at 12:26:07PM +0200, Wolfram Sang wrote:
> 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 at pengutronix.de>
> Cc: Sascha Hauer <s.hauer at pengutronix.de>
> Cc: Shawn Guo <shawn.guo at freescale.com>
> ---

Ping.

>  arch/arm/mach-mxs/clock-mx28.c |    2 +-
>  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 633c395..63d6117 100644
> --- a/arch/arm/mach-mxs/clock-mx28.c
> +++ b/arch/arm/mach-mxs/clock-mx28.c
> @@ -413,7 +413,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;						\
>  	}								\
> -- 
> 1.7.5.4
> 

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111116/96eb6c6f/attachment-0001.sig>