[SCSI] sun3x_esp: Convert && to ||

[linux-2.6-omap-h63xx.git] / kernel / irq / migration.c

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 4baa3bbcd25a0c516e7ae05de2eeed2dbd523814..77b7acc875c5df6755954161736b72918fff49ad 100644 (file)
--- 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);
 }