aboutsummaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-12 22:11:56 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-12 22:11:56 +0100
commit889cf721d7f9249542315599032accffea3b9288 (patch)
tree91a4dcfc2f41c9ccdc664dc156901e7922208994 /net/tipc
parentdbe30538771b7c9811e397c7ce50db546209b4f6 (diff)
parent63cd201e6559142b16dd2af8c911edd491bf6274 (diff)
Merge branch 'next/boards2' into next/soc2
Dependency for more Renesas soc changes Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/handler.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index 111ff8300ae..b36f0fcd9bd 100644
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -116,7 +116,6 @@ void tipc_handler_stop(void)
return;
handler_enabled = 0;
- tasklet_disable(&tipc_tasklet);
tasklet_kill(&tipc_tasklet);
spin_lock_bh(&qitem_lock);