aboutsummaryrefslogtreecommitdiff
path: root/kernel/irq/autoprobe.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-16 15:33:18 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:30 +0200
commit63d659d556f145d33798b8ad19ced10c254fe445 (patch)
tree2d657b684d13539893bd944bb85c546cb74b1396 /kernel/irq/autoprobe.c
parent10e580842ec8e53dddf62e1ab1871f4906477376 (diff)
downloadlinux-2.6.34-ux500-63d659d556f145d33798b8ad19ced10c254fe445.tar.gz
genirq: fix name space collision of nr_irqs in autoprobe.c
probe_irq_off() is disfunctional as the local nr_irqs is referenced instead of the global one for the for_each_irq_desc() iterator. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r--kernel/irq/autoprobe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 0cbff18efb6..cc0f7321b8c 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -161,7 +161,7 @@ EXPORT_SYMBOL(probe_irq_mask);
*/
int probe_irq_off(unsigned long val)
{
- int i, irq_found = 0, nr_irqs = 0;
+ int i, irq_found = 0, nr_of_irqs = 0;
struct irq_desc *desc;
unsigned int status;
@@ -171,9 +171,9 @@ int probe_irq_off(unsigned long val)
if (status & IRQ_AUTODETECT) {
if (!(status & IRQ_WAITING)) {
- if (!nr_irqs)
+ if (!nr_of_irqs)
irq_found = i;
- nr_irqs++;
+ nr_of_irqs++;
}
desc->status = status & ~IRQ_AUTODETECT;
desc->chip->shutdown(i);
@@ -182,7 +182,7 @@ int probe_irq_off(unsigned long val)
}
mutex_unlock(&probing_active);
- if (nr_irqs > 1)
+ if (nr_of_irqs > 1)
irq_found = -irq_found;
return irq_found;