Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / kernel / irq / autoprobe.c

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 394784c57060257e77666fdb9173697cf1a35092..342d8f44e4010d13cb03f21b89a57d9dc955497e 100644 (file)
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -70,10 +70,8 @@ unsigned long probe_irq_on(void)
                raw_spin_lock_irq(&desc->lock);
                if (!desc->action && irq_settings_can_probe(desc)) {
                        desc->istate |= IRQS_AUTODETECT | IRQS_WAITING;
-                       if (irq_startup(desc)) {
-                               irq_compat_set_pending(desc);
+                       if (irq_startup(desc))
                                desc->istate |= IRQS_PENDING;
-                       }
                }
                raw_spin_unlock_irq(&desc->lock);
        }