diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-15 10:52:41 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-15 10:52:41 -0700 |
| commit | 1255dfbb0c77c7a26fec10a5c101b075c3641965 (patch) | |
| tree | bd886568c8a932649afa30181f0231b1ae0b3a3b /drivers/pci | |
| parent | a870614a5371f8e36676e9bb2e089f4121976135 (diff) | |
| parent | ebd50b939c33c692a4914e66bf06a99b21ffa483 (diff) | |
| download | op-kernel-dev-1255dfbb0c77c7a26fec10a5c101b075c3641965.zip op-kernel-dev-1255dfbb0c77c7a26fec10a5c101b075c3641965.tar.gz | |
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
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/iov.c | 1 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 68311ec..9dce7c5 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 1cbd590..95c97be 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 |
