Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6

[pandora-kernel.git] / arch / arm / common / vic.c

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 887c6eb..6ed8983 100644 (file)
--- 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;
 }