Skip to content

Commit 25046d5

Browse files
committed
Merge tag 'pci-v6.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci fix from Bjorn Helgaas: - Fix vmd MSI interrupt domain restructure that caused crash early in boot (Nam Cao) * tag 'pci-v6.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: PCI: vmd: Fix wrong kfree() in vmd_msi_free()
2 parents b20b853 + d5c647b commit 25046d5

File tree

1 file changed

+3
-1
lines changed
  • drivers/pci/controller

1 file changed

+3
-1
lines changed

drivers/pci/controller/vmd.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,12 @@ static int vmd_msi_alloc(struct irq_domain *domain, unsigned int virq,
280280
static void vmd_msi_free(struct irq_domain *domain, unsigned int virq,
281281
unsigned int nr_irqs)
282282
{
283+
struct irq_data *irq_data;
283284
struct vmd_irq *vmdirq;
284285

285286
for (int i = 0; i < nr_irqs; ++i) {
286-
vmdirq = irq_get_chip_data(virq + i);
287+
irq_data = irq_domain_get_irq_data(domain, virq + i);
288+
vmdirq = irq_data->chip_data;
287289

288290
synchronize_srcu(&vmdirq->irq->srcu);
289291

0 commit comments

Comments
 (0)