Merge branch 'pci/misc' into next · tjh.dev/kernel@1255dfb

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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

Bjorn Helgaas 12 years ago 1255dfbb a870614a

+2 -1

2 changed files

expand all

drivers

pci

iov.c

pci.c

drivers/pci/iov.c

··· 84 84 virtfn->dev.parent = dev->dev.parent; 85 85 virtfn->physfn = pci_dev_get(dev); 86 86 virtfn->is_virtfn = 1; 87 + virtfn->multifunction = 0; 87 88 88 89 for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { 89 90 res = dev->resource + PCI_IOV_RESOURCES + i;

+1 -1

drivers/pci/pci.c

··· 2961 2961 EXPORT_SYMBOL_GPL(pci_check_and_mask_intx); 2962 2962 2963 2963 /** 2964 - * pci_check_and_mask_intx - unmask INTx of no interrupt is pending 2964 + * pci_check_and_unmask_intx - unmask INTx if no interrupt is pending 2965 2965 * @dev: the PCI device to operate on 2966 2966 * 2967 2967 * Check if the device dev has its INTx line asserted, unmask it if not