projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca2b721
)
enic: fix location of vnic dev unregister in enic_probe cleanup code
author
Roopa Prabhu
<
[email protected]
>
Wed, 18 Jan 2012 04:24:12 +0000
(
04:24
+0000)
committer
David S. Miller
<
[email protected]
>
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 <
[email protected]
>
Signed-off-by: Christian Benvenuti <
[email protected]
>
Signed-off-by: Sujith Sankar <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/cisco/enic/enic_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/cisco/enic/enic_main.c
b/drivers/net/ethernet/cisco/enic/enic_main.c
index 03b0577bd619b5ca03467a367534d4b35cc82176..045c468ac8efa568166075426c57721a477dbe13 100644
(file)
--- 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: