* [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
* [PATCH] lpc32xx/clock: Use && instead of &
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
1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2010-08-10 15:42 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
Wolfram Sang wrote:
> 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)) {
Could also kill unnecessary parens, while at it...
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] lpc32xx/clock: Use && instead of &
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
1 sibling, 1 reply; 4+ messages in thread
From: Kevin Wells @ 2010-08-19 22:50 UTC (permalink / raw)
To: linux-arm-kernel
> Subject: [PATCH] lpc32xx/clock: Use && instead of &
>
> 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>
Acked-by: Kevin Wells <wellsk40@gmail.com>
Do you want me to pull this patch into my next series?
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] lpc32xx/clock: Use && instead of &
2010-08-19 22:50 ` Kevin Wells
@ 2010-08-20 6:31 ` Wolfram Sang
0 siblings, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2010-08-20 6:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 20, 2010 at 12:50:17AM +0200, Kevin Wells wrote:
> > Subject: [PATCH] lpc32xx/clock: Use && instead of &
> >
> > 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>
>
> Acked-by: Kevin Wells <wellsk40@gmail.com>
>
> Do you want me to pull this patch into my next series?
Yes, I think this would be easiest.
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100820/f5192be9/attachment-0001.sig>
^ permalink raw reply [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).