Merge tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux into fixes

This is the fixes set for v4.18 cycle.

This is a fix for suspending all pxa3xx platforms, where high
number interrupts are not reenabled.

* tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux:
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 9c10248fadcc..4e8c2116808e 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -185,7 +185,7 @@ static int pxa_irq_suspend(void)
 {
         int i;
 
-        for (i = 0; i < pxa_internal_irq_nr / 32; i++) {
+        for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {
                 void __iomem *base = irq_base(i);
 
                 saved_icmr[i] = __raw_readl(base + ICMR);
@@ -204,7 +204,7 @@ static void pxa_irq_resume(void)
 {
         int i;
 
-        for (i = 0; i < pxa_internal_irq_nr / 32; i++) {
+        for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {
                 void __iomem *base = irq_base(i);
 
                 __raw_writel(saved_icmr[i], base + ICMR);