diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 10:30:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 10:30:34 -0800 |
| commit | 73efd00d473118297cc8ecbdd54429d5f6c6f241 (patch) | |
| tree | 0ef8eec486537336d801246e5b90b3e1205dde78 /arch/arm/mach-dove/include/mach/pm.h | |
| parent | 90bf80a1f110426433d6d3e77f5143b58b41165c (diff) | |
| parent | 9434d24b11ccceeb39522965593ef2ddc9eb4e7c (diff) | |
| download | lwn-73efd00d473118297cc8ecbdd54429d5f6c6f241.tar.gz lwn-73efd00d473118297cc8ecbdd54429d5f6c6f241.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"These are three fixes for the Marvell EBU family and one for the
Samsung s3c platforms. All of them are obvious should still make it
into 3.7."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: Kirkwood: Update PCI-E fixup
Dove: Fix irq_to_pmu()
Dove: Attempt to fix PMU/RTC interrupts
ARM: S3C24XX: Fix potential NULL pointer dereference error
Diffstat (limited to 'arch/arm/mach-dove/include/mach/pm.h')
| -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 7bcd0dfce4b1..b47f75038686 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; |