aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <[email protected]>2022-10-05 17:32:53 -0500
committerBjorn Helgaas <[email protected]>2022-10-05 17:32:53 -0500
commit519e512110e45c818ea8bd5c657b246d87c5ccd8 (patch)
tree1fcbefc6808f4f32b44c697f3ae66b89ca4fd69e
parentf9538e27a2d9a386b1b488075e687867c599cd51 (diff)
parent2b96f92ca4257c05e352f61742839b451e293949 (diff)
Merge branch 'pci/msi'
- Correct a typo in 71020a3c0dff4 ('PCI/MSI: Use msi_add_msi_desc()') that reversed the sense of 'can_mask' in msi_add_msi_desc() (Josef Johansson) * pci/msi: PCI/MSI: Correct 'can_mask' test in msi_add_msi_desc()
-rw-r--r--drivers/pci/msi/msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 9037a7827eca..fdd2ec09651e 100644
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -526,7 +526,7 @@ static int msix_setup_msi_descs(struct pci_dev *dev, void __iomem *base,
desc.pci.msi_attrib.can_mask = !pci_msi_ignore_mask &&
!desc.pci.msi_attrib.is_virtual;
- if (!desc.pci.msi_attrib.can_mask) {
+ if (desc.pci.msi_attrib.can_mask) {
addr = pci_msix_desc_addr(&desc);
desc.pci.msix_ctrl = readl(addr + PCI_MSIX_ENTRY_VECTOR_CTRL);
}