linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] lpc32xx/clock: Use && instead of &
@ 2010-08-10 14:48 Wolfram Sang
  2010-08-10 15:42 ` Sergei Shtylyov
  2010-08-19 22:50 ` Kevin Wells
  0 siblings, 2 replies; 4+ messages in thread
From: Wolfram Sang @ 2010-08-10 14:48 UTC (permalink / raw)
  To: linux-arm-kernel

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

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Kevin Wells <wellsk40@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)) {
 			reg = __raw_readl(LPC32XX_CLKPWR_USB_CTRL);
 			if (reg & LPC32XX_CLKPWR_USBCTRL_PLL_STS)
 				ret = 0;
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-08-20  6:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-10 14:48 [PATCH] lpc32xx/clock: Use && instead of & Wolfram Sang
2010-08-10 15:42 ` Sergei Shtylyov
2010-08-19 22:50 ` Kevin Wells
2010-08-20  6:31   ` Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).