1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index ddc956861a58..ad2ce72c83c4 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -87,10 +87,11 @@ int irq_set_affinity(unsigned int irq, cpumask_t cpumask)
                 return -EINVAL;
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
-        if (desc->status & IRQ_MOVE_PCNTXT) {
+        if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) {
                 unsigned long flags;
 
                 spin_lock_irqsave(&desc->lock, flags);
+                desc->affinity = cpumask;
                 desc->chip->set_affinity(irq, cpumask);
                 spin_unlock_irqrestore(&desc->lock, flags);
         } else