[PATCH] lpc32xx/clock: Use && instead of &

Sergei Shtylyov sshtylyov at mvista.com
Tue Aug 10 11:42:21 EDT 2010


Hello.

Wolfram Sang wrote:

> Because we are connecting two expressions here, not binary values.

> Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
> Cc: Kevin Wells <wellsk40 at gmail.com>
> ---
>  arch/arm/mach-lpc32xx/clock.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

> diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c
> index 32d6379..9ff1438 100644
> --- a/arch/arm/mach-lpc32xx/clock.c
> +++ b/arch/arm/mach-lpc32xx/clock.c
> @@ -397,7 +397,7 @@ static int local_usbpll_enable(struct clk *clk, int enable)
>  		__raw_writel(reg, LPC32XX_CLKPWR_USB_CTRL);
>  
>  		/* Wait for PLL lock */
> -		while ((timeout > jiffies) & (ret == -ENODEV)) {
> +		while ((timeout > jiffies) && (ret == -ENODEV)) {

    Could also kill unnecessary parens, while at it...

WBR, Sergei



More information about the linux-arm-kernel mailing list