1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 30658e9827f0..ad0aac6d1248 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -353,10 +353,11 @@ static int setup_affinity(struct irq_desc *desc, struct cpumask *mask)
                 return 0;
 
         /*
-         * Preserve an userspace affinity setup, but make sure that
-         * one of the targets is online.
+         * Preserve the managed affinity setting and an userspace affinity
+         * setup, but make sure that one of the targets is online.
          */
-        if (irqd_has_set(&desc->irq_data, IRQD_AFFINITY_SET)) {
+        if (irqd_affinity_is_managed(&desc->irq_data) ||
+            irqd_has_set(&desc->irq_data, IRQD_AFFINITY_SET)) {
                 if (cpumask_intersects(desc->irq_common_data.affinity,
                                        cpu_online_mask))
                         set = desc->irq_common_data.affinity;