1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 2ce3df3504e6..59cb4303e251 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -443,6 +443,8 @@ void gpiochip_set_chained_irqchip(struct gpio_chip *gpiochip,
                  */
                 irq_set_handler_data(parent_irq, gpiochip);
                 irq_set_chained_handler(parent_irq, parent_handler);
+
+                gpiochip->irq_parent = parent_irq;
         }
 
         /* Set the parent IRQ for all affected IRQs */
@@ -551,6 +553,11 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
 
         acpi_gpiochip_free_interrupts(gpiochip);
 
+        if (gpiochip->irq_parent) {
+                irq_set_chained_handler(gpiochip->irq_parent, NULL);
+                irq_set_handler_data(gpiochip->irq_parent, NULL);
+        }
+
         /* Remove all IRQ mappings and delete the domain */
         if (gpiochip->irqdomain) {
                 for (offset = 0; offset < gpiochip->ngpio; offset++)