diff options
| author | Roopa Prabhu <roprabhu@cisco.com> | 2012-01-18 04:24:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-18 16:16:41 -0500 |
| commit | 35d87e3325e91ec6bc446bf71f50eccc9a7b3b8f (patch) | |
| tree | d8082d521242ce2b1e871ffc4364a478f1c12876 /drivers/net | |
| parent | ca2b721de25b9893310fd695a38b495d14c70ff3 (diff) | |
| download | linux-3.10-35d87e3325e91ec6bc446bf71f50eccc9a7b3b8f.tar.gz linux-3.10-35d87e3325e91ec6bc446bf71f50eccc9a7b3b8f.tar.bz2 linux-3.10-35d87e3325e91ec6bc446bf71f50eccc9a7b3b8f.zip | |
enic: fix location of vnic dev unregister in enic_probe cleanup code
The vnic_dev_unregister is erroneously under CONFIG_PCI_IOV. This patch moves
it out of CONFIG_PCI_IOV
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: Sujith Sankar <ssujith@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 03b0577bd61..045c468ac8e 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2531,8 +2531,8 @@ err_out_disable_sriov_pp: enic->priv_flags &= ~ENIC_SRIOV_ENABLED; } err_out_vnic_unregister: - vnic_dev_unregister(enic->vdev); #endif + vnic_dev_unregister(enic->vdev); err_out_iounmap: enic_iounmap(enic); err_out_release_regions: |