diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2024-04-17 10:51:19 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2024-04-17 10:51:19 +0200 |
| commit | 398c9955bdead2cf027cc263c13e7bd75e9d9116 (patch) | |
| tree | fe464d6342561b319b4b64fb3d7d7f08a329f034 /drivers | |
| parent | a0cedbcc8852d6c77b00634b81e41f17f29d9404 (diff) | |
| parent | aa43c15a790cf083a6e6a7c531cffd27a5e1fd4f (diff) | |
Merge tag 'renesas-pinctrl-fixes-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into fixes
pinctrl: renesas: Fixes for v6.9
- Fix a dtbs_check warning on RZ/G3S,
- Fix a lockdep warning on RZ/G2L.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/renesas/pinctrl-rzg2l.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c index eb5a8c654260..93916553bcc7 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c @@ -2063,8 +2063,17 @@ static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl) continue; } - if (!irqd_irq_disabled(data)) + if (!irqd_irq_disabled(data)) { + unsigned long flags; + + /* + * This has to be atomically executed to protect against a concurrent + * interrupt. + */ + raw_spin_lock_irqsave(&pctrl->lock.rlock, flags); rzg2l_gpio_irq_enable(data); + raw_spin_unlock_irqrestore(&pctrl->lock.rlock, flags); + } } } |