Merge tag 'usb-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / kernel / irq / autoprobe.c

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 16cbf6b..ae60cae 100644 (file)
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -90,7 +90,7 @@ unsigned long probe_irq_on(void)
                        /* It triggered already - consider it spurious. */
                        if (!(desc->istate & IRQS_WAITING)) {
                                desc->istate &= ~IRQS_AUTODETECT;
-                               irq_shutdown(desc);
+                               irq_shutdown_and_deactivate(desc);
                        } else
                                if (i < 32)
                                        mask |= 1 << i;
@@ -127,7 +127,7 @@ unsigned int probe_irq_mask(unsigned long val)
                                mask |= 1 << i;
 
                        desc->istate &= ~IRQS_AUTODETECT;
-                       irq_shutdown(desc);
+                       irq_shutdown_and_deactivate(desc);
                }
                raw_spin_unlock_irq(&desc->lock);
        }
@@ -169,7 +169,7 @@ int probe_irq_off(unsigned long val)
                                nr_of_irqs++;
                        }
                        desc->istate &= ~IRQS_AUTODETECT;
-                       irq_shutdown(desc);
+                       irq_shutdown_and_deactivate(desc);
                }
                raw_spin_unlock_irq(&desc->lock);
        }