Commit dff5c3de authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'renesas-pinctrl-fixes-for-v6.10-tag1' of... 

Merge tag 'renesas-pinctrl-fixes-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers

 into fixes

pinctrl: renesas: Fixes for v6.10

  - Fix PREEMPT_RT build failure on RZ/G2L.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 1613e604 a39741d3

drivers/pinctrl/renesas/pinctrl-rzg2l.c

+2 −2
Original line number Diff line number Diff line
@@ -2071,11 +2071,11 @@ static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl) 
		 * This has to be atomically executed to protect against a concurrent

		 * interrupt.

		 */

		raw_spin_lock_irqsave(&pctrl->lock.rlock, flags);

		spin_lock_irqsave(&pctrl->lock, flags);

		ret = rzg2l_gpio_irq_set_type(data, irqd_get_trigger_type(data));

		if (!ret && !irqd_irq_disabled(data))

			rzg2l_gpio_irq_enable(data);

		raw_spin_unlock_irqrestore(&pctrl->lock.rlock, flags);

		spin_unlock_irqrestore(&pctrl->lock, flags);



		if (ret)

			dev_crit(pctrl->dev, "Failed to set IRQ type for virq=%u\n", virq);