diff options
| author |   Salil Mehta <salil.mehta@huawei.com> | 2018-05-19 16:53:15 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-20 18:53:58 -0400 |
| commit | 743e1a8438e5a37f9ab1846e75a47de8e9cd522f (patch) | |
| tree | 9718147bf7c8d441a155378d02488373b4a040ba /drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | |
| parent | r8169: fix network error on resume from suspend (diff) | |
| download | linux-dev-743e1a8438e5a37f9ab1846e75a47de8e9cd522f.tar.xz linux-dev-743e1a8438e5a37f9ab1846e75a47de8e9cd522f.zip | |
net: hns3: Fixes error reported by Kbuild and internal review
This patch fixes the error reported by Intel's kbuild and fixes a
return value in one of the legs, caught during review of the original
patch sent by kbuild.
Fixes: fdb793670a00 ("net: hns3: Add support of .sriov_configure in HNS3 driver")
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index e85ff3805c96..e75c65270222 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1579,7 +1579,7 @@ static void hns3_remove(struct pci_dev *pdev) * Enable or change the number of VFs. Called when the user updates the number * of VFs in sysfs. **/ -int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs) +static int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs) { int ret; @@ -1592,6 +1592,8 @@ int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs) ret = pci_enable_sriov(pdev, num_vfs); if (ret) dev_err(&pdev->dev, "SRIOV enable failed %d\n", ret); + else + return num_vfs; } else if (!pci_vfs_assigned(pdev)) { pci_disable_sriov(pdev); } else { |