git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of github.com:davem330/net
[pandora-kernel.git]
/
net
/
can
/
af_can.c
diff --git
a/net/can/af_can.c
b/net/can/af_can.c
index
b9efa94
..
d1ff515
100644
(file)
--- a/
net/can/af_can.c
+++ b/
net/can/af_can.c
@@
-857,7
+857,7
@@
static __exit void can_exit(void)
struct net_device *dev;
if (stats_timer)
- del_timer(&can_stattimer);
+ del_timer
_sync
(&can_stattimer);
can_remove_proc();