Commit a674bf74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2026-05-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irqchip driver fixes from Ingo Molnar:

 - Fix the hardware probing error path of the renesas-rzt2h
   irqchip driver

 - Fix the exynos-combiner irqchip driver on -rt kernels
   by turning the IRQ controller spinlock into a raw spinlock

* tag 'irq-urgent-2026-05-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/renesas-rzt2h: Use pm_runtime_put_sync() in probe error path
  irqchip/exynos-combiner: Switch to raw_spinlock
parents ee651da6 c9b7598e

drivers/irqchip/exynos-combiner.c

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#define IRQ_IN_COMBINER		8



static DEFINE_SPINLOCK(irq_controller_lock);

static DEFINE_RAW_SPINLOCK(irq_controller_lock);



struct combiner_chip_data {

	unsigned int hwirq_offset;
@@ -72,9 +72,9 @@ static void combiner_handle_cascade_irq(struct irq_desc *desc) 


	chained_irq_enter(chip, desc);



	spin_lock(&irq_controller_lock);

	raw_spin_lock(&irq_controller_lock);

	status = readl_relaxed(chip_data->base + COMBINER_INT_STATUS);

	spin_unlock(&irq_controller_lock);

	raw_spin_unlock(&irq_controller_lock);

	status &= chip_data->irq_mask;



	if (status == 0)

drivers/irqchip/irq-renesas-rzt2h.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int rzt2h_icu_init(struct platform_device *pdev, struct device_node *pare 
	irq_domain = irq_domain_create_hierarchy(parent_domain, 0, RZT2H_ICU_NUM_IRQ,

						 dev_fwnode(dev), &rzt2h_icu_domain_ops, priv);

	if (!irq_domain) {

		pm_runtime_put(dev);

		pm_runtime_put_sync(dev);

		return -ENOMEM;

	}