github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Revert a change that added a bad iounmap(NULL) call

Browse Source 
to the MSI IRQ support code (Yuanhe Shu)
 
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmo7nAMRHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1gDhBAAn8yt913axtamaxeHqxilazuOTYX4j1jA
 f8eMNMwvhWaCIz6d3kh8R+haqLYc+3RYVcMEG/RlQkboTI2boostGDfK8yk+Jv0l
 fN26Q3PBVArs6mU6fji+LJcboroJdMWf/G5UGGZCH3lecST9yf+BUdUu5gxcpBBq
 dZm8lxcUWoDFdkyLV5vj063yPg5R9w6VZ6CTTBeDZYR66mjZBUIEhaVQD/UWKhdH
 2X6Q8hm/amy7K7sl3b61sa6RLxrNSKmwX9qZhJ6MpM5xABYYxkiRpZShhhNct26Q
 +dQk6ucr/mbcyPY2gK1Xili9teNvCd9Z9rI5zDpz1CNftXBic9u4A60iODXfaKjv
 EbfgUhmlorFywOeZhR7kb3S3Kjiwgnq3UOhyUsfLvCQmGOLFkP/q82G+Re+LP468
 mGjMtUwYQINlRPixRnX6oltx1A2KgzcyQ2dONPTkdScmyk1hCcrl92cckQjpctHE
 pLwZKHdwru4oMFvvt2gnvPGj42C7WWEbyqGrGR+sfqdiX69GD3iOSuV20739VbrM
 myQ2vfzRXFXbT+rGPZEVMa5MO2eBgqKlyF4YCENdapcWOl4wjCyzZfEYziDQl+Xu
 vpEU37HT1C41tGbcpVHpDPVXQhPsMV+xHyi3tezq1ciWQG9RqF7KCrkmubZgrsYf
 jbws/i4Xfgo=
 =AQ7U
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2026-06-24 12:41:04 -07:00
commit d0bcd488c3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/msi/msi.c
View File

@ -749,7 +749,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
ret = msix_setup_interrupts(dev, entries, nvec, affd);
if (ret)
goto out_unmap;
goto out_disable;
/* Disable INTX */
pci_intx_for_msi(dev, 0);
@ -770,8 +770,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
pcibios_free_irq(dev);
return 0;
out_unmap:
iounmap(dev->msix_base);
out_disable:
dev->msix_enabled = 0;
pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0);