2 files changed, 12 insertions, 4 deletions

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 3f6b34febbf1..433af328d981 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -534,8 +534,16 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id)
                                 continue;
                         irq = irq_find_mapping(gc->irqdomain, irqnr + i);
                         generic_handle_irq(irq);
-                        /* Clear interrupt */
+
+                        /* Clear interrupt.
+                         * We must read the pin register again, in case the
+                         * value was changed while executing
+                         * generic_handle_irq() above.
+                         */
+                        raw_spin_lock_irqsave(&gpio_dev->lock, flags);
+                        regval = readl(regs + i);
                         writel(regval, regs + i);
+                        raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
                         ret = IRQ_HANDLED;
                 }
         }
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index 3e40d4245512..9c950bbf07ba 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -407,10 +407,10 @@ static int mcp23s08_get(struct gpio_chip *chip, unsigned offset)
         ret = mcp_read(mcp, MCP_GPIO, &status);
         if (ret < 0)
                 status = 0;
-        else
+        else {
+                mcp->cached_gpio = status;
                 status = !!(status & (1 << offset));
-
-        mcp->cached_gpio = status;
+        }
 
         mutex_unlock(&mcp->lock);
         return status;