---

yaml --- r: 263896 b: refs/heads/master c: d9e64f8 h: refs/heads/master v: v3
git-mirror · Sep 15, 2011 · fb71d53 · fb71d53
1 parent b31f4b1
commit fb71d53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b59e3191daade2b975eeec1c71c591eb5c86b7b
+refs/heads/master: d9e64f83ebb8f563810b10536b23516d3bd30e80
diff --git a/trunk/net/can/af_can.c b/trunk/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();