summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2012-11-18 16:39:32 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-21 18:28:25 +0000
commitd356cf5a74afa32b40decca3c9dd88bc3cd63eb5 (patch)
treec129e0e195c3d899a164724bf7d9b242d2093bbd
parent5d3df935426271016b895aecaa247101b4bfa35e (diff)
downloadlinux-3.10-d356cf5a74afa32b40decca3c9dd88bc3cd63eb5.tar.gz
linux-3.10-d356cf5a74afa32b40decca3c9dd88bc3cd63eb5.tar.bz2
linux-3.10-d356cf5a74afa32b40decca3c9dd88bc3cd63eb5.zip
Dove: Fix irq_to_pmu()
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> Cc: stable@vger.kernel.org Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/mach-dove/include/mach/pm.h2
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 7bcd0dfce4b..b47f7503868 100644
--- a/arch/arm/mach-dove/include/mach/pm.h
+++ b/arch/arm/mach-dove/include/mach/pm.h
@@ -63,7 +63,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;