projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' into next
[linux-2.6-microblaze.git]
/
net
/
smc
/
smc_ib.c
diff --git
a/net/smc/smc_ib.c
b/net/smc/smc_ib.c
index
d6ba186
..
05b825b
100644
(file)
--- a/
net/smc/smc_ib.c
+++ b/
net/smc/smc_ib.c
@@
-582,6
+582,7
@@
static void smc_ib_remove_dev(struct ib_device *ibdev, void *client_data)
smc_smcr_terminate_all(smcibdev);
smc_ib_cleanup_per_ibdev(smcibdev);
ib_unregister_event_handler(&smcibdev->event_handler);
+ cancel_work_sync(&smcibdev->port_event_work);
kfree(smcibdev);
}