tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Ingo Molnar:
"Two genirq fixes, plus an irqchip driver error handling fix"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent()
genirq: Initialize request_mutex if CONFIG_SPARSE_IRQ=n
irqchip/irq-ls1x: Missing error code in ls1x_intc_of_init()

Linus Torvalds 6a022984 54c63a75

+6
+1
drivers/irqchip/irq-ls1x.c
··· 130 130 NULL); 131 131 if (!priv->domain) { 132 132 pr_err("ls1x-irq: cannot add IRQ domain\n"); 133 + err = -ENOMEM; 133 134 goto out_iounmap; 134 135 } 135 136
+4
kernel/irq/chip.c
··· 1449 1449 int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on) 1450 1450 { 1451 1451 data = data->parent_data; 1452 + 1453 + if (data->chip->flags & IRQCHIP_SKIP_SET_WAKE) 1454 + return 0; 1455 + 1452 1456 if (data->chip->irq_set_wake) 1453 1457 return data->chip->irq_set_wake(data, on); 1454 1458
+1
kernel/irq/irqdesc.c
··· 558 558 alloc_masks(&desc[i], node); 559 559 raw_spin_lock_init(&desc[i].lock); 560 560 lockdep_set_class(&desc[i].lock, &irq_desc_lock_class); 561 + mutex_init(&desc[i].request_mutex); 561 562 desc_set_defaults(i, &desc[i], node, NULL, NULL); 562 563 } 563 564 return arch_early_irq_init();