diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
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 | ||