From fb71d53aff35b730edf3fae99122630bc9c81963 Mon Sep 17 00:00:00 2001 From: "rajan.aggarwal85@gmail.com" Date: Tue, 30 Aug 2011 23:57:38 +0000 Subject: [PATCH] --- yaml --- r: 263896 b: refs/heads/master c: d9e64f83ebb8f563810b10536b23516d3bd30e80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/can/af_can.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 852c59ca31a2..912c051f42c0 100644 --- 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 index 8ce926d3b2cb..9b0c32a2690c 100644 --- 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();