Skip to content

Commit 1a8d4c6

Browse files
Haoxiang LiThomas Gleixner
authored andcommitted
PCI/MSI: Unmap MSI-X region on error
msix_capability_init() fails to unmap the MSI-X region if msix_setup_interrupts() fails. Add the missing iounmap() for that error path. [ tglx: Massaged change log ] Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Link: https://patch.msgid.link/20260125144452.2103812-1-lihaoxiang@isrc.iscas.ac.cn
1 parent df43971 commit 1a8d4c6

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/pci/msi/msi.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
737737

738738
ret = msix_setup_interrupts(dev, entries, nvec, affd);
739739
if (ret)
740-
goto out_disable;
740+
goto out_unmap;
741741

742742
/* Disable INTX */
743743
pci_intx_for_msi(dev, 0);
@@ -758,6 +758,8 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
758758
pcibios_free_irq(dev);
759759
return 0;
760760

761+
out_unmap:
762+
iounmap(dev->msix_base);
761763
out_disable:
762764
dev->msix_enabled = 0;
763765
pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0);

0 commit comments

Comments
 (0)