diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2012-11-18 16:39:32 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-10 10:45:07 -0800 |
| commit | 6d62cb399dbff7dbb354c3b4eae534ee0c0e5dc0 (patch) | |
| tree | c4c1b8af71cc6467f11725f0c16cfa6bec0be31b | |
| parent | 31a2aa119dd0b760b0931e6dfa0847a697d6d7d6 (diff) | |
| download | linux-stable-6d62cb399dbff7dbb354c3b4eae534ee0c0e5dc0.tar.gz linux-stable-6d62cb399dbff7dbb354c3b4eae534ee0c0e5dc0.tar.bz2 linux-stable-6d62cb399dbff7dbb354c3b4eae534ee0c0e5dc0.zip | |
Dove: Fix irq_to_pmu()
commit d356cf5a74afa32b40decca3c9dd88bc3cd63eb5 upstream.
PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
Fix the condition. (It may have been less likely to occur had the code
been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
to understand notation, and matches the normal way of thinking about
these things.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/mach-dove/include/mach/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/include/mach/pm.h b/arch/arm/mach-dove/include/mach/pm.h index 3ad9f946a9e8..11799c33475e 100644 --- a/arch/arm/mach-dove/include/mach/pm.h +++ b/arch/arm/mach-dove/include/mach/pm.h @@ -45,7 +45,7 @@ static inline int pmu_to_irq(int pin) static inline int irq_to_pmu(int irq) { - if (IRQ_DOVE_PMU_START < irq && irq < NR_IRQS) + if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS) return irq - IRQ_DOVE_PMU_START; return -EINVAL; |