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

2 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 68311ec849ee..9dce7c5e2a77 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -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;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1cbd590cf1d1..95c97bec8018 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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