Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1255dfbb authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Fix pci_check_and_unmask_intx() comment typos
  PCI: Never treat a VF as a multifunction device
parents a870614a ebd50b93

drivers/pci/iov.c

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) 
	virtfn->dev.parent = dev->dev.parent;

	virtfn->physfn = pci_dev_get(dev);

	virtfn->is_virtfn = 1;

	virtfn->multifunction = 0;



	for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {

		res = dev->resource + PCI_IOV_RESOURCES + i;

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -2961,7 +2961,7 @@ bool pci_check_and_mask_intx(struct pci_dev *dev) 
EXPORT_SYMBOL_GPL(pci_check_and_mask_intx);



/**

 * pci_check_and_mask_intx - unmask INTx of no interrupt is pending

 * pci_check_and_unmask_intx - unmask INTx if no interrupt is pending

 * @dev: the PCI device to operate on

 *

 * Check if the device dev has its INTx line asserted, unmask it if not