d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a logic bug in the split PCI interrupt code that slipped through

Browse Source 
Reported by:	Harry Schmalzbauer
This commit is contained in:
scottl 2017-07-31 16:55:56 +00:00
parent 76925ae8c9
commit 58fdb26bf8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/mpr/mpr_pci.c
View File

@ -260,6 +260,7 @@ mpr_pci_alloc_interrupts(struct mpr_softc *sc)
dev = sc->mpr_dev;
error = 0;
msgs = 0;
if ((sc->disable_msix == 0) &&
((msgs = pci_msix_count(dev)) >= MPR_MSI_COUNT))
@ -267,7 +268,7 @@ mpr_pci_alloc_interrupts(struct mpr_softc *sc)
if ((error != 0) && (sc->disable_msi == 0) &&
((msgs = pci_msi_count(dev)) >= MPR_MSI_COUNT))
error = mpr_alloc_msi(sc, MPR_MSI_COUNT);
else
if (error != 0)
msgs = 0;
sc->msi_msgs = msgs;

3
sys/dev/mps/mps_pci.c
View File

@ -245,6 +245,7 @@ mps_pci_alloc_interrupts(struct mps_softc *sc)
dev = sc->mps_dev;
error = 0;
msgs = 0;
if ((sc->disable_msix == 0) &&
((msgs = pci_msix_count(dev)) >= MPS_MSI_COUNT))
@ -252,7 +253,7 @@ mps_pci_alloc_interrupts(struct mps_softc *sc)
if ((error != 0) && (sc->disable_msi == 0) &&
((msgs = pci_msi_count(dev)) >= MPS_MSI_COUNT))
error = mps_alloc_msi(sc, MPS_MSI_COUNT);
else
if (error != 0)
msgs = 0;
sc->msi_msgs = msgs;