diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-02-01 20:40:01 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-02-01 20:40:01 +0300 |
| commit | 7dd113b7caf54b7c45a9627da5d6392784377e7c (patch) | |
| tree | 4fa43480f225dfdff3b63ecd6a33b1f69ecc35a6 /drivers/pci/endpoint/pci-ep-cfs.c | |
| parent | 16093362d66ac205811b666ce7c38a0f34ace623 (diff) | |
| parent | b330104fa76df3eae6e199a23791fed5d35f06b4 (diff) | |
| download | linux-7dd113b7caf54b7c45a9627da5d6392784377e7c.tar.xz | |
Merge remote-tracking branch 'lorenzo/pci/endpoint' into next
* lorenzo/pci/endpoint:
PCI: endpoint: Use EPC's device in dma_alloc_coherent()/dma_free_coherent()
PCI: designware-ep: Fix ->get_msi() to check MSI_EN bit
PCI: endpoint: Fix find_first_zero_bit() usage
PCI: endpoint: Populate func_no before calling pci_epc_add_epf()
PCI: designware-ep: Fix find_first_zero_bit() usage
Diffstat (limited to 'drivers/pci/endpoint/pci-ep-cfs.c')
| -rw-r--r-- | drivers/pci/endpoint/pci-ep-cfs.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c index 48a89dff0e7f..9ec28be1e378 100644 --- a/drivers/pci/endpoint/pci-ep-cfs.c +++ b/drivers/pci/endpoint/pci-ep-cfs.c @@ -101,22 +101,23 @@ static int pci_epc_epf_link(struct config_item *epc_item, { int ret; u32 func_no = 0; - struct pci_epc *epc; - struct pci_epf *epf; struct pci_epf_group *epf_group = to_pci_epf_group(epf_item); struct pci_epc_group *epc_group = to_pci_epc_group(epc_item); - - epc = epc_group->epc; - epf = epf_group->epf; - ret = pci_epc_add_epf(epc, epf); - if (ret) - goto err_add_epf; + struct pci_epc *epc = epc_group->epc; + struct pci_epf *epf = epf_group->epf; func_no = find_first_zero_bit(&epc_group->function_num_map, - sizeof(epc_group->function_num_map)); + BITS_PER_LONG); + if (func_no >= BITS_PER_LONG) + return -EINVAL; + set_bit(func_no, &epc_group->function_num_map); epf->func_no = func_no; + ret = pci_epc_add_epf(epc, epf); + if (ret) + goto err_add_epf; + ret = pci_epf_bind(epf); if (ret) goto err_epf_bind; |