| Message ID | 1315650367-3371-1-git-send-email-w.sang@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
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@pengutronix.de> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Shawn Guo <shawn.guo@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 >
On Wed, Nov 16, 2011 at 02:20:42PM +0100, Wolfram Sang wrote: > 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@pengutronix.de> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > Cc: Shawn Guo <shawn.guo@freescale.com> > > --- > > Ping. > Applied on mxs/fixes, thanks.
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; \ } \
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> --- arch/arm/mach-mxs/clock-mx28.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)