X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Firq%2Fmigration.c;h=77b7acc875c5df6755954161736b72918fff49ad;hb=8b7f07155f8ee1536da2f9590f1aa9383afefb6b;hp=4baa3bbcd25a0c516e7ae05de2eeed2dbd523814;hpb=fefd26b3b8597a11a422d950c0d4424ff33a70ad;p=linux-2.6

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 4baa3bbcd2..77b7acc875 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -65,12 +65,11 @@ void move_native_irq(int irq)
 	if (likely(!(desc->status & IRQ_MOVE_PENDING)))
 		return;
 
-	if (likely(!(desc->status & IRQ_DISABLED)))
-		desc->chip->disable(irq);
+	if (unlikely(desc->status & IRQ_DISABLED))
+		return;
 
+	desc->chip->mask(irq);
 	move_masked_irq(irq);
-
-	if (likely(!(desc->status & IRQ_DISABLED)))
-		desc->chip->enable(irq);
+	desc->chip->unmask(irq);
 }