enic: fix location of vnic dev unregister in enic_probe cleanup code
authorRoopa Prabhu <roprabhu@cisco.com>
Wed, 18 Jan 2012 04:24:12 +0000 (04:24 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jan 2012 21:16:41 +0000 (16:16 -0500)
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>
drivers/net/ethernet/cisco/enic/enic_main.c

index 03b0577..045c468 100644 (file)
@@ -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: