Skip to content

Commit a674bf7

Browse files
committed
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
2 parents ee651da + c9b7598 commit a674bf7

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/irqchip/exynos-combiner.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#define IRQ_IN_COMBINER 8
2626

27-
static DEFINE_SPINLOCK(irq_controller_lock);
27+
static DEFINE_RAW_SPINLOCK(irq_controller_lock);
2828

2929
struct combiner_chip_data {
3030
unsigned int hwirq_offset;
@@ -72,9 +72,9 @@ static void combiner_handle_cascade_irq(struct irq_desc *desc)
7272

7373
chained_irq_enter(chip, desc);
7474

75-
spin_lock(&irq_controller_lock);
75+
raw_spin_lock(&irq_controller_lock);
7676
status = readl_relaxed(chip_data->base + COMBINER_INT_STATUS);
77-
spin_unlock(&irq_controller_lock);
77+
raw_spin_unlock(&irq_controller_lock);
7878
status &= chip_data->irq_mask;
7979

8080
if (status == 0)

drivers/irqchip/irq-renesas-rzt2h.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ static int rzt2h_icu_init(struct platform_device *pdev, struct device_node *pare
265265
irq_domain = irq_domain_create_hierarchy(parent_domain, 0, RZT2H_ICU_NUM_IRQ,
266266
dev_fwnode(dev), &rzt2h_icu_domain_ops, priv);
267267
if (!irq_domain) {
268-
pm_runtime_put(dev);
268+
pm_runtime_put_sync(dev);
269269
return -ENOMEM;
270270
}
271271

0 commit comments

Comments
 (0)