diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-21 09:57:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-21 09:57:42 +0000 |
| commit | 4ab452c56f5c65636fbf1cf0a7b43cd5c05889b6 (patch) | |
| tree | 24cb63796feaf1fe4d2bd8a6c2298c5974fdde62 /drivers/net/ethernet/cavium/thunder | |
| parent | 43603a35574c2e594f9e10a97a40874d1282dd7e (diff) | |
| parent | e95d10da90f48177a1ffd3fef90c9997977cfc24 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linaro-lsk-v4.9-rt
Diffstat (limited to 'drivers/net/ethernet/cavium/thunder')
| -rw-r--r-- | drivers/net/ethernet/cavium/thunder/nic_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 6677b96e1f3f..da142f6bd0c3 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -1371,6 +1371,9 @@ static void nic_remove(struct pci_dev *pdev) { struct nicpf *nic = pci_get_drvdata(pdev); + if (!nic) + return; + if (nic->flags & NIC_SRIOV_ENABLED) pci_disable_sriov(pdev); |