1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 4acf8b2e9226..6fdae789ccc9 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -437,7 +437,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq,
         irq_set_lockdep_class(irq, &gpiochip_irq_lock_class);
         irq_set_chip_and_handler(irq, chip->irqchip, chip->irq_handler);
         /* Chips that can sleep need nested thread handlers */
-        if (chip->can_sleep)
+        if (chip->can_sleep && !chip->irq_not_threaded)
                 irq_set_nested_thread(irq, 1);
 #ifdef CONFIG_ARM
         set_irq_flags(irq, IRQF_VALID);