Skip to content

Commit d0bcd48

Browse files
committed
Merge tag 'irq-msi-2026-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull MSI irq fix from Ingo Molnar: - Revert a change that added a bad iounmap(NULL) call to the MSI IRQ support code (Yuanhe Shu) * tag 'irq-msi-2026-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Revert "PCI/MSI: Unmap MSI-X region on error"
2 parents 0587402 + f64e03d commit d0bcd48

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/pci/msi/msi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
749749

750750
ret = msix_setup_interrupts(dev, entries, nvec, affd);
751751
if (ret)
752-
goto out_unmap;
752+
goto out_disable;
753753

754754
/* Disable INTX */
755755
pci_intx_for_msi(dev, 0);
@@ -770,8 +770,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
770770
pcibios_free_irq(dev);
771771
return 0;
772772

773-
out_unmap:
774-
iounmap(dev->msix_base);
775773
out_disable:
776774
dev->msix_enabled = 0;
777775
pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0);

0 commit comments

Comments
 (0)