1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index 4a8a8efadefa..cf73a403d22d 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -636,6 +636,14 @@ static int mcp23s08_irq_setup(struct mcp23s08 *mcp)
                 return err;
         }
 
+        return 0;
+}
+
+static int mcp23s08_irqchip_setup(struct mcp23s08 *mcp)
+{
+        struct gpio_chip *chip = &mcp->chip;
+        int err;
+
         err =  gpiochip_irqchip_add_nested(chip,
                                            &mcp23s08_irq_chip,
                                            0,
@@ -912,7 +920,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
         }
 
         if (mcp->irq && mcp->irq_controller) {
-                ret = mcp23s08_irq_setup(mcp);
+                ret = mcp23s08_irqchip_setup(mcp);
                 if (ret)
                         goto fail;
         }
@@ -944,6 +952,9 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
                 goto fail;
         }
 
+        if (mcp->irq)
+                ret = mcp23s08_irq_setup(mcp);
+
 fail:
         if (ret < 0)
                 dev_dbg(dev, "can't setup chip %d, --> %d\n", addr, ret);