1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 6fdae789ccc9..550e575c6ffb 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -514,7 +514,8 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
         /* Remove all IRQ mappings and delete the domain */
         if (gpiochip->irqdomain) {
                 for (offset = 0; offset < gpiochip->ngpio; offset++)
-                        irq_dispose_mapping(gpiochip->irq_base + offset);
+                        irq_dispose_mapping(
+                                irq_find_mapping(gpiochip->irqdomain, offset));
                 irq_domain_remove(gpiochip->irqdomain);
         }