diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-05-07 17:22:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-07 17:22:09 -0700 |
| commit | a9e41a529681b38087c91ebc0bb91e12f510ca2d (patch) | |
| tree | 544bf5861113e2f7e676a333a1267d887c800870 /net/dsa | |
| parent | net: phy: improve pause mode reporting in phy_print_status (diff) | |
| parent | cxgb4: Fix error path in cxgb4_init_module (diff) | |
| download | linux-dev-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.xz linux-dev-a9e41a529681b38087c91ebc0bb91e12f510ca2d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict with the DSA legacy code removal.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 9e1fc0b08290..1fc782fab393 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -344,7 +344,7 @@ static int __init dsa_init_module(void) rc = dsa_slave_register_notifier(); if (rc) - return rc; + goto register_notifier_fail; dev_add_pack(&dsa_pack_type); @@ -352,6 +352,11 @@ static int __init dsa_init_module(void) THIS_MODULE); return 0; + +register_notifier_fail: + destroy_workqueue(dsa_owq); + + return rc; } module_init(dsa_init_module); |