Skip to content

Commit

Permalink
fpga: dfl: pci: fix return value of cci_pci_sriov_configure
Browse files Browse the repository at this point in the history
pci_driver.sriov_configure should return negative value on error and
number of enabled VFs on success. But now the driver returns 0 on
success. The sriov configure still works but will cause a warning
message:

  XX VFs requested; only 0 enabled

This patch changes the return value accordingly.

Cc: stable@vger.kernel.org
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Wu Hao <hao.wu@intel.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
  • Loading branch information
yilunxu1984 authored and mfischer committed Mar 31, 2020
1 parent daec0f4 commit 3c2760b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/fpga/dfl-pci.c
Expand Up @@ -248,11 +248,13 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)
return ret;

ret = pci_enable_sriov(pcidev, num_vfs);
if (ret)
if (ret) {
dfl_fpga_cdev_config_ports_pf(cdev);
return ret;
}
}

return ret;
return num_vfs;
}

static void cci_pci_remove(struct pci_dev *pcidev)
Expand Down

0 comments on commit 3c2760b

Please sign in to comment.