diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-08-04 10:58:32 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-08-04 10:58:36 +0300 |
| commit | 9524588381df213554a10d3661a9200a4b7f6db2 (patch) | |
| tree | a4d281b99dcd28b9a1d3077299c26a5671abff88 /drivers/fpga/dfl-pci.c | |
| parent | 666e403461fd046b37bc95bba49e82ca6a758bea (diff) | |
| parent | 67da9e2c2b730b9b788ace749d22d769cf11ee2b (diff) | |
| download | linux-dev-5.7.tar.xz | |
Merge tag 'v5.7.12' into dev-5.7dev-5.7
This is the 5.7.12 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/fpga/dfl-pci.c')
| -rw-r--r-- | drivers/fpga/dfl-pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c index 538755062ab7..a78c409bf2c4 100644 --- a/drivers/fpga/dfl-pci.c +++ b/drivers/fpga/dfl-pci.c @@ -227,7 +227,6 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs) { struct cci_drvdata *drvdata = pci_get_drvdata(pcidev); struct dfl_fpga_cdev *cdev = drvdata->cdev; - int ret = 0; if (!num_vfs) { /* @@ -239,6 +238,8 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs) dfl_fpga_cdev_config_ports_pf(cdev); } else { + int ret; + /* * before enable SRIOV, put released ports into VF access mode * first of all. |