1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 1cdfdea5d7ef..501aaf1f253f 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -708,11 +708,14 @@ static void iosapic_set_affinity_irq(unsigned int irq,
         struct vector_info *vi = iosapic_get_vector(irq);
         u32 d0, d1, dummy_d0;
         unsigned long flags;
+        int dest_cpu;
 
-        if (cpu_check_affinity(irq, dest))
+        dest_cpu = cpu_check_affinity(irq, dest);
+        if (dest_cpu < 0)
                 return;
 
-        vi->txn_addr = txn_affinity_addr(irq, cpumask_first(dest));
+        irq_desc[irq].affinity = cpumask_of_cpu(dest_cpu);
+        vi->txn_addr = txn_affinity_addr(irq, dest_cpu);
 
         spin_lock_irqsave(&iosapic_lock, flags);
         /* d1 contains the destination CPU, so only want to set that