Skip to contentSkip to conversation

arm: incorrect use of "&&" instead of "&"

PATCH-2.4 Willy Tarreau 2 participants 3 messages Nov 25, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Russell,

I'm about to merge this fix into 2.4. It's already been fixed in 2.6. Do you have any objection ?

BTW, I have two email addresses for you, the one in the MAINTAINERS file and the one you use on LKML. Which one do you prefer ? Just in case, I've used both.

Thanks in advance,
Willy

Quoted 1 line

From f3779aa6e0b38c0dfdad4f98b6bcddcd570b6aa7 Mon Sep 17 00:00:00 2001

From: Willy Tarreau <[email protected]>
Date: Sat, 25 Nov 2006 22:00:12 +0100
Subject: [PATCH] arm: incorrect use of "&&" instead of "&"

In integrator_init_irq(), the use of "&&" in the following statement causes all interrupts to be marked valid regardless of INTEGRATOR_SC_VALID_INT, as long as it's non-zero :

     if (((1 << i) && INTEGRATOR_SC_VALID_INT) != 0)

Obvious fix is to replace it with "&". This was already fixed in 2.6.

---
 arch/arm/mach-integrator/irq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-integrator/irq.c +1 -1
index 69d2e67..cc56534 100644
@@ -55,7 +55,7 @@ void __init integrator_init_irq(void)
 	unsigned int i;
 
 	for (i = 0; i < NR_IRQS; i++) {
-	        if (((1 << i) && INTEGRATOR_SC_VALID_INT) != 0) {
+	        if (((1 << i) & INTEGRATOR_SC_VALID_INT) != 0) {
 		        irq_desc[i].valid	= 1;
 			irq_desc[i].probe_ok	= 1;
 			irq_desc[i].mask_ack	= sc_mask_irq;
Signature · 1 line
1.4.2.4
#1 lore raw
Quoted 2 lines · Willy Tarreau

I'm about to merge this fix into 2.4. It's already been fixed in 2.6. Do you have any objection ?

No objection - please merge.

Quoted 3 lines

BTW, I have two email addresses for you, the one in the MAINTAINERS file and the one you use on LKML. Which one do you prefer ? Just in case, I've used both.

Both reach me, but I'd perfer rmk+kernel please.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#2 lore raw
Quoted 5 lines · Russell King
Quoted 2 lines · Willy Tarreau

I'm about to merge this fix into 2.4. It's already been fixed in 2.6. Do you have any objection ?

No objection - please merge.

done.

Quoted 5 lines
Quoted 3 lines

BTW, I have two email addresses for you, the one in the MAINTAINERS file and the one you use on LKML. Which one do you prefer ? Just in case, I've used both.

Both reach me, but I'd perfer rmk+kernel please.

OK, that's noted.

Thanks !
Willy