Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 4 insertions, 5 deletions

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 4baa3bbcd25a..77b7acc875c5 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);
 }