Commit 519e5121 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/msi' 

- Correct a typo in 71020a3c ('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()
parents f9538e27 2b96f92c

drivers/pci/msi/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

		}