2 files changed, 7 insertions, 3 deletions

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 664c7b8b1ba8..337741f734ac 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -117,7 +117,7 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val)
         u32 val;
 
         spin_lock(&irq_controller_lock);
-        irq_desc[irq].cpu = cpu;
+        irq_desc[irq].node = cpu;
         val = readl(reg) & ~(0xff << shift);
         val |= 1 << (cpu + shift);
         writel(val, reg);
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 887c6eb3a18a..6ed89836e908 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -229,14 +229,18 @@ static int vic_set_wake(unsigned int irq, unsigned int on)
 {
         struct vic_device *v = vic_from_irq(irq);
         unsigned int off = irq & 31;
+        u32 bit = 1 << off;
 
         if (!v)
                 return -EINVAL;
 
+        if (!(bit & v->resume_sources))
+                return -EINVAL;
+
         if (on)
-                v->resume_irqs |= 1 << off;
+                v->resume_irqs |= bit;
         else
-                v->resume_irqs &= ~(1 << off);
+                v->resume_irqs &= ~bit;
 
         return 0;
 }