diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/dsa/dsa.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 6112a12578b2..3fb14b7c13cf 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c | |||
| @@ -390,7 +390,7 @@ static int dsa_remove(struct platform_device *pdev) | |||
| 390 | if (dst->link_poll_needed) | 390 | if (dst->link_poll_needed) |
| 391 | del_timer_sync(&dst->link_poll_timer); | 391 | del_timer_sync(&dst->link_poll_timer); |
| 392 | 392 | ||
| 393 | flush_scheduled_work(); | 393 | flush_work_sync(&dst->link_poll_work); |
| 394 | 394 | ||
| 395 | for (i = 0; i < dst->pd->nr_chips; i++) { | 395 | for (i = 0; i < dst->pd->nr_chips; i++) { |
| 396 | struct dsa_switch *ds = dst->ds[i]; | 396 | struct dsa_switch *ds = dst->ds[i]; |
| @@ -428,7 +428,7 @@ static void __exit dsa_cleanup_module(void) | |||
| 428 | } | 428 | } |
| 429 | module_exit(dsa_cleanup_module); | 429 | module_exit(dsa_cleanup_module); |
| 430 | 430 | ||
| 431 | MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>") | 431 | MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>"); |
| 432 | MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips"); | 432 | MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips"); |
| 433 | MODULE_LICENSE("GPL"); | 433 | MODULE_LICENSE("GPL"); |
| 434 | MODULE_ALIAS("platform:dsa"); | 434 | MODULE_ALIAS("platform:dsa"); |