diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
commit | 9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch) | |
tree | c6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |
parent | bf551413038f74343ec4d1413c3610e2362d0aeb (diff) | |
parent | 249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff) |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 0d0665ca6f19..c73cabdbd4c0 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
@@ -6149,8 +6149,10 @@ static int __init cxgb4_init_module(void) | |||
6149 | pr_warn("could not create debugfs entry, continuing\n"); | 6149 | pr_warn("could not create debugfs entry, continuing\n"); |
6150 | 6150 | ||
6151 | ret = pci_register_driver(&cxgb4_driver); | 6151 | ret = pci_register_driver(&cxgb4_driver); |
6152 | if (ret < 0) | 6152 | if (ret < 0) { |
6153 | debugfs_remove(cxgb4_debugfs_root); | 6153 | debugfs_remove(cxgb4_debugfs_root); |
6154 | destroy_workqueue(workq); | ||
6155 | } | ||
6154 | 6156 | ||
6155 | register_inet6addr_notifier(&cxgb4_inet6addr_notifier); | 6157 | register_inet6addr_notifier(&cxgb4_inet6addr_notifier); |
6156 | 6158 | ||